diff options
Diffstat (limited to 'kernel/audit.c')
-rw-r--r-- | kernel/audit.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index dc4aba21f30a..c18b769e23a2 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -416,12 +416,8 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
416 | return -EINVAL; | 416 | return -EINVAL; |
417 | /* fallthrough */ | 417 | /* fallthrough */ |
418 | case AUDIT_LIST: | 418 | case AUDIT_LIST: |
419 | #ifdef CONFIG_AUDITSYSCALL | ||
420 | err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid, | 419 | err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid, |
421 | uid, seq, data, loginuid); | 420 | uid, seq, data, loginuid); |
422 | #else | ||
423 | err = -EOPNOTSUPP; | ||
424 | #endif | ||
425 | break; | 421 | break; |
426 | case AUDIT_SIGNAL_INFO: | 422 | case AUDIT_SIGNAL_INFO: |
427 | sig_data.uid = audit_sig_uid; | 423 | sig_data.uid = audit_sig_uid; |
@@ -636,15 +632,11 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx) | |||
636 | return NULL; | 632 | return NULL; |
637 | } | 633 | } |
638 | 634 | ||
639 | #ifdef CONFIG_AUDITSYSCALL | 635 | if (!audit_get_stamp(ab->ctx, &t, &serial)) { |
640 | if (ab->ctx) | ||
641 | audit_get_stamp(ab->ctx, &t, &serial); | ||
642 | else | ||
643 | #endif | ||
644 | { | ||
645 | t = CURRENT_TIME; | 636 | t = CURRENT_TIME; |
646 | serial = 0; | 637 | serial = 0; |
647 | } | 638 | } |
639 | |||
648 | audit_log_format(ab, "audit(%lu.%03lu:%u): ", | 640 | audit_log_format(ab, "audit(%lu.%03lu:%u): ", |
649 | t.tv_sec, t.tv_nsec/1000000, serial); | 641 | t.tv_sec, t.tv_nsec/1000000, serial); |
650 | return ab; | 642 | return ab; |