diff options
author | Ondrej Mosnáček <omosnace@redhat.com> | 2018-06-05 05:00:10 -0400 |
---|---|---|
committer | Paul Moore <paul@paul-moore.com> | 2018-06-19 10:33:04 -0400 |
commit | af85d1772e31fed34165a1b3decef340cf4080c0 (patch) | |
tree | ca0eeeab957a8724b475a47b0d2b1e27fdec4476 | |
parent | d87de4a878e110d0061fb22726d37a54a281285d (diff) |
audit: Fix extended comparison of GID/EGID
The audit_filter_rules() function in auditsc.c used the in_[e]group_p()
functions to check GID/EGID match, but these functions use the current
task's credentials, while the comparison should use the credentials of
the task given to audit_filter_rules() as a parameter (tsk).
Note that we can use group_search(cred->group_info, ...) as a
replacement for both in_group_p and in_egroup_p as these functions only
compare the parameter to cred->fsgid/egid and then call group_search.
In fact, the usage of in_group_p was even more incorrect: it compares to
cred->fsgid (which is usually equal to cred->egid) and not cred->gid.
GitHub issue:
https://github.com/linux-audit/audit-kernel/issues/82
Fixes: 37eebe39c973 ("audit: improve GID/EGID comparation logic")
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
-rw-r--r-- | kernel/auditsc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 5f0bd5ece578..d762e0b8160e 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -494,20 +494,20 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
494 | result = audit_gid_comparator(cred->gid, f->op, f->gid); | 494 | result = audit_gid_comparator(cred->gid, f->op, f->gid); |
495 | if (f->op == Audit_equal) { | 495 | if (f->op == Audit_equal) { |
496 | if (!result) | 496 | if (!result) |
497 | result = in_group_p(f->gid); | 497 | result = groups_search(cred->group_info, f->gid); |
498 | } else if (f->op == Audit_not_equal) { | 498 | } else if (f->op == Audit_not_equal) { |
499 | if (result) | 499 | if (result) |
500 | result = !in_group_p(f->gid); | 500 | result = !groups_search(cred->group_info, f->gid); |
501 | } | 501 | } |
502 | break; | 502 | break; |
503 | case AUDIT_EGID: | 503 | case AUDIT_EGID: |
504 | result = audit_gid_comparator(cred->egid, f->op, f->gid); | 504 | result = audit_gid_comparator(cred->egid, f->op, f->gid); |
505 | if (f->op == Audit_equal) { | 505 | if (f->op == Audit_equal) { |
506 | if (!result) | 506 | if (!result) |
507 | result = in_egroup_p(f->gid); | 507 | result = groups_search(cred->group_info, f->gid); |
508 | } else if (f->op == Audit_not_equal) { | 508 | } else if (f->op == Audit_not_equal) { |
509 | if (result) | 509 | if (result) |
510 | result = !in_egroup_p(f->gid); | 510 | result = !groups_search(cred->group_info, f->gid); |
511 | } | 511 | } |
512 | break; | 512 | break; |
513 | case AUDIT_SGID: | 513 | case AUDIT_SGID: |