diff options
Diffstat (limited to 'kernel/audit.c')
-rw-r--r-- | kernel/audit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 82443fb433ef..d417ca1db79b 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -445,7 +445,7 @@ void audit_send_reply(int pid, int seq, int type, int done, int multi, | |||
445 | * Check for appropriate CAP_AUDIT_ capabilities on incoming audit | 445 | * Check for appropriate CAP_AUDIT_ capabilities on incoming audit |
446 | * control messages. | 446 | * control messages. |
447 | */ | 447 | */ |
448 | static int audit_netlink_ok(kernel_cap_t eff_cap, u16 msg_type) | 448 | static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type) |
449 | { | 449 | { |
450 | int err = 0; | 450 | int err = 0; |
451 | 451 | ||
@@ -459,13 +459,13 @@ static int audit_netlink_ok(kernel_cap_t eff_cap, u16 msg_type) | |||
459 | case AUDIT_DEL: | 459 | case AUDIT_DEL: |
460 | case AUDIT_DEL_RULE: | 460 | case AUDIT_DEL_RULE: |
461 | case AUDIT_SIGNAL_INFO: | 461 | case AUDIT_SIGNAL_INFO: |
462 | if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL)) | 462 | if (security_netlink_recv(skb, CAP_AUDIT_CONTROL)) |
463 | err = -EPERM; | 463 | err = -EPERM; |
464 | break; | 464 | break; |
465 | case AUDIT_USER: | 465 | case AUDIT_USER: |
466 | case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: | 466 | case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: |
467 | case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: | 467 | case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: |
468 | if (!cap_raised(eff_cap, CAP_AUDIT_WRITE)) | 468 | if (security_netlink_recv(skb, CAP_AUDIT_WRITE)) |
469 | err = -EPERM; | 469 | err = -EPERM; |
470 | break; | 470 | break; |
471 | default: /* bad msg */ | 471 | default: /* bad msg */ |
@@ -488,7 +488,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
488 | char *ctx; | 488 | char *ctx; |
489 | u32 len; | 489 | u32 len; |
490 | 490 | ||
491 | err = audit_netlink_ok(NETLINK_CB(skb).eff_cap, msg_type); | 491 | err = audit_netlink_ok(skb, msg_type); |
492 | if (err) | 492 | if (err) |
493 | return err; | 493 | return err; |
494 | 494 | ||