diff options
author | Steve Grubb <sgrubb@redhat.com> | 2005-05-20 19:18:37 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-20 19:18:37 -0400 |
commit | 05474106a41f44d16d649bc8c7687fc24ce4370a (patch) | |
tree | 0c6893b88d843795d60eb03e929bac3e8937bc9c | |
parent | 011161051bbc25f7f8b7df059dbd934c534443f0 (diff) |
AUDIT: Fix AVC_USER message passing.
The original AVC_USER message wasn't consolidated with the new range of
user messages. The attached patch fixes the kernel so the old messages
work again.
Signed-off-by: Steve Grubb <sgrubb@redhat.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r-- | kernel/audit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 41581413529c..5e72895f4826 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -354,6 +354,7 @@ static int audit_netlink_ok(kernel_cap_t eff_cap, u16 msg_type) | |||
354 | if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL)) | 354 | if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL)) |
355 | err = -EPERM; | 355 | err = -EPERM; |
356 | break; | 356 | break; |
357 | case AUDIT_USER: | ||
357 | case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: | 358 | case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: |
358 | if (!cap_raised(eff_cap, CAP_AUDIT_WRITE)) | 359 | if (!cap_raised(eff_cap, CAP_AUDIT_WRITE)) |
359 | err = -EPERM; | 360 | err = -EPERM; |
@@ -432,6 +433,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
432 | audit_set_backlog_limit(status_get->backlog_limit, | 433 | audit_set_backlog_limit(status_get->backlog_limit, |
433 | loginuid); | 434 | loginuid); |
434 | break; | 435 | break; |
436 | case AUDIT_USER: | ||
435 | case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: | 437 | case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: |
436 | ab = audit_log_start(NULL, msg_type); | 438 | ab = audit_log_start(NULL, msg_type); |
437 | if (!ab) | 439 | if (!ab) |