summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAmeen Ali <ameenali023@gmail.com>2015-02-23 15:38:00 -0500
committerPaul Moore <pmoore@redhat.com>2015-02-23 15:38:00 -0500
commit5985de6754a6fc22fbf7e4b6033d4bfa0240a63a (patch)
treefdd9548236374772015f783fc0777af723efd64e /kernel
parentefef73a1a206c4b5e37e5c63a361243ed1603eff (diff)
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')
-rw-r--r--kernel/audit.c5
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)
673 case AUDIT_MAKE_EQUIV: 673 case AUDIT_MAKE_EQUIV:
674 /* Only support auditd and auditctl in initial pid namespace 674 /* Only support auditd and auditctl in initial pid namespace
675 * for now. */ 675 * for now. */
676 if ((task_active_pid_ns(current) != &init_pid_ns)) 676 if (task_active_pid_ns(current) != &init_pid_ns)
677 return -EPERM; 677 return -EPERM;
678 678
679 if (!netlink_capable(skb, CAP_AUDIT_CONTROL)) 679 if (!netlink_capable(skb, CAP_AUDIT_CONTROL))
@@ -1770,7 +1770,7 @@ void audit_log_name(struct audit_context *context, struct audit_names *n,
1770 } else 1770 } else
1771 audit_log_format(ab, " name=(null)"); 1771 audit_log_format(ab, " name=(null)");
1772 1772
1773 if (n->ino != (unsigned long)-1) { 1773 if (n->ino != (unsigned long)-1)
1774 audit_log_format(ab, " inode=%lu" 1774 audit_log_format(ab, " inode=%lu"
1775 " dev=%02x:%02x mode=%#ho" 1775 " dev=%02x:%02x mode=%#ho"
1776 " ouid=%u ogid=%u rdev=%02x:%02x", 1776 " ouid=%u ogid=%u rdev=%02x:%02x",
@@ -1782,7 +1782,6 @@ void audit_log_name(struct audit_context *context, struct audit_names *n,
1782 from_kgid(&init_user_ns, n->gid), 1782 from_kgid(&init_user_ns, n->gid),
1783 MAJOR(n->rdev), 1783 MAJOR(n->rdev),
1784 MINOR(n->rdev)); 1784 MINOR(n->rdev));
1785 }
1786 if (n->osid != 0) { 1785 if (n->osid != 0) {
1787 char *ctx = NULL; 1786 char *ctx = NULL;
1788 u32 len; 1787 u32 len;