diff options
| author | Ameen Ali <ameenali023@gmail.com> | 2015-02-23 21:38:00 +0100 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2015-02-23 21:38:00 +0100 |
| commit | 5985de6754a6fc22fbf7e4b6033d4bfa0240a63a (patch) | |
| tree | fdd9548236374772015f783fc0777af723efd64e /kernel/audit.c | |
| parent | audit: don't reset working wait time accidentally with auditd (diff) | |
| download | linux-5985de6754a6fc22fbf7e4b6033d4bfa0240a63a.tar.xz linux-5985de6754a6fc22fbf7e4b6033d4bfa0240a63a.zip | |
audit: code clean up
Fixed a coding style issue (unnecessary parentheses , unnecessary braces)
Signed-off-by: Ameen-Ali <Ameenali023@gmail.com>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 59d4ceb3b2a6..d219bb03a364 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -673,7 +673,7 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type) case AUDIT_MAKE_EQUIV: /* Only support auditd and auditctl in initial pid namespace * for now. */ - if ((task_active_pid_ns(current) != &init_pid_ns)) + if (task_active_pid_ns(current) != &init_pid_ns) return -EPERM; if (!netlink_capable(skb, CAP_AUDIT_CONTROL)) @@ -1770,7 +1770,7 @@ void audit_log_name(struct audit_context *context, struct audit_names *n, } else audit_log_format(ab, " name=(null)"); - if (n->ino != (unsigned long)-1) { + if (n->ino != (unsigned long)-1) audit_log_format(ab, " inode=%lu" " dev=%02x:%02x mode=%#ho" " ouid=%u ogid=%u rdev=%02x:%02x", @@ -1782,7 +1782,6 @@ void audit_log_name(struct audit_context *context, struct audit_names *n, from_kgid(&init_user_ns, n->gid), MAJOR(n->rdev), MINOR(n->rdev)); - } if (n->osid != 0) { char *ctx = NULL; u32 len; |