mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
audit/stable-4.18 PR 20180814
-----BEGIN PGP SIGNATURE----- iQJIBAABCAAyFiEEcQCq365ubpQNLgrWVeRaWujKfIoFAltzOI8UHHBhdWxAcGF1 bC1tb29yZS5jb20ACgkQVeRaWujKfIqvOw/9F48G0G87ETN2M1O3fFLpANd2GtPH cYtg6SG8b3nZzkllUBOVZjoj7y0OyTgi+ksm5XSmgcR4npELDHWRhXaCma1s8Hxw Zpk2SWrEmwdudec9zZ8sBtvd6t63P9TkVSk3S4z+1HgH6uzPg6lMes4w/cQIdn0e uEIiuNkOOHXxWLxgphxPJ/XffQCfV6ltm9j41Z2S6RZHe/0UsJSKCwD+LwW+jLe3 0e9oUPWVnxZlhpJoctWpgtaYmG8rtqxfXruFwg2mR5d2VBs966h3FCz9b9qhtA+R HPy/KagJuUFRL+6ZlpX1dtkkNi07LKjsx3OJYBNHNKmYDA5yJF3X/mMV4uMkroFz q8k88Wi1dYWKJvLhAGALRGSbiYljLgDFJH31tN2FWHb93+l3CXLhjmwIyUxrtiW1 DfUJYM8/ZzMjghpb6YoHi1Dq+Z1cG07S1Eo0pTmtxVT2g43eXSL4OvxFhJKkCFv9 n1J/fo6JVw9i+4DqWkk+8NFGXYYZFlfrGl14szTp+8Q9Gw6OlWWcnF/o3+KCtPez 5z5+E64pAHhLa9/gaHu62eK4lIpiXv3IE8fA7OvFxrUpSJbtYc0RnGv8eKhO8J6v Q9TQKJGbbOLwP+mF/8sPexsREDaU3fB68dTj/FF5AHLH8KFUgAQYcm0bIzpNDBSd w+REW+TTiht8W6E= =tnPz -----END PGP SIGNATURE----- Merge tag 'audit-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit Pull audit patches from Paul Moore: "Twelve audit patches for v4.19 and they run the full gamut from fixes to features. Notable changes include the ability to use the "exe" audit filter field in a wider variety of filter types, a fix for our comparison of GID/EGID in audit filter rules, better association of related audit records (connecting related audit records together into one audit event), and a fix for a potential use-after-free in audit_add_watch(). All the patches pass the audit-testsuite and merge cleanly on your current master branch" * tag 'audit-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit: audit: fix use-after-free in audit_add_watch audit: use ktime_get_coarse_real_ts64() for timestamps audit: use ktime_get_coarse_ts64() for time access audit: simplify audit_enabled check in audit_watch_log_rule_change() audit: check audit_enabled in audit_tree_log_remove_rule() cred: conditionally declare groups-related functions audit: eliminate audit_enabled magic number comparison audit: rename FILTER_TYPE to FILTER_EXCLUDE audit: Fix extended comparison of GID/EGID audit: tie ANOM_ABEND records to syscall audit: tie SECCOMP records to syscall audit: allow other filter list types for AUDIT_EXE
This commit is contained in:
commit
8c32685030
12 changed files with 67 additions and 45 deletions
|
|
@ -494,20 +494,20 @@ static int audit_filter_rules(struct task_struct *tsk,
|
|||
result = audit_gid_comparator(cred->gid, f->op, f->gid);
|
||||
if (f->op == Audit_equal) {
|
||||
if (!result)
|
||||
result = in_group_p(f->gid);
|
||||
result = groups_search(cred->group_info, f->gid);
|
||||
} else if (f->op == Audit_not_equal) {
|
||||
if (result)
|
||||
result = !in_group_p(f->gid);
|
||||
result = !groups_search(cred->group_info, f->gid);
|
||||
}
|
||||
break;
|
||||
case AUDIT_EGID:
|
||||
result = audit_gid_comparator(cred->egid, f->op, f->gid);
|
||||
if (f->op == Audit_equal) {
|
||||
if (!result)
|
||||
result = in_egroup_p(f->gid);
|
||||
result = groups_search(cred->group_info, f->gid);
|
||||
} else if (f->op == Audit_not_equal) {
|
||||
if (result)
|
||||
result = !in_egroup_p(f->gid);
|
||||
result = !groups_search(cred->group_info, f->gid);
|
||||
}
|
||||
break;
|
||||
case AUDIT_SGID:
|
||||
|
|
@ -1544,10 +1544,10 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
|
|||
context->argv[2] = a3;
|
||||
context->argv[3] = a4;
|
||||
context->serial = 0;
|
||||
context->ctime = current_kernel_time64();
|
||||
context->in_syscall = 1;
|
||||
context->current_state = state;
|
||||
context->ppid = 0;
|
||||
ktime_get_coarse_real_ts64(&context->ctime);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2466,7 +2466,7 @@ void audit_core_dumps(long signr)
|
|||
if (signr == SIGQUIT) /* don't care for those */
|
||||
return;
|
||||
|
||||
ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_ANOM_ABEND);
|
||||
ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_ANOM_ABEND);
|
||||
if (unlikely(!ab))
|
||||
return;
|
||||
audit_log_task(ab);
|
||||
|
|
@ -2490,7 +2490,7 @@ void audit_seccomp(unsigned long syscall, long signr, int code)
|
|||
{
|
||||
struct audit_buffer *ab;
|
||||
|
||||
ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_SECCOMP);
|
||||
ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_SECCOMP);
|
||||
if (unlikely(!ab))
|
||||
return;
|
||||
audit_log_task(ab);
|
||||
|
|
|
|||
Loading…
Reference in a new issue