AUDIT: Fix inconsistent use of loginuid vs. auid, signed vs. unsigned

The attached patch changes all occurrences of loginuid to auid. It also 
changes everything to %u that is an unsigned type.

Signed-off-by: Steve Grubb <sgrubb@redhat.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index 5e72895f4826..f0a003acf621 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -439,12 +439,9 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                 if (!ab)
                         break;  /* audit_panic has been called */
                 audit_log_format(ab,
-                                 "user pid=%d uid=%d length=%d loginuid=%u"
+                                 "user pid=%d uid=%u auid=%u"
                                  " msg='%.1024s'",
-                                 pid, uid,
-                                 (int)(nlh->nlmsg_len
-                                       - ((char *)data - (char *)nlh)),
-                                 loginuid, (char *)data);
+                                 pid, uid, loginuid, (char *)data);
                 audit_set_pid(ab, pid);
                 audit_log_end(ab);
                 break;