From: Chris Wright <chrisw@osdl.org>
Date: Wed, 11 May 2005 09:43:07 +0000 (+0100)
Subject: AUDIT: Properly account for alignment difference in nlmsg_len.
X-Git-Tag: v2.6.13-rc1~90^2~583^2~53^2~30
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a241d77039a2632e81070619d5733258728f8bd;p=pandora-kernel.git

AUDIT: Properly account for alignment difference in nlmsg_len.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/kernel/audit.c b/kernel/audit.c
index ddb69a458203..a5f03cb2c0f5 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -488,7 +488,7 @@ static inline int audit_log_drain(struct audit_buffer *ab)
 
 		if (audit_pid) {
 			struct nlmsghdr *nlh = (struct nlmsghdr *)skb->data;
-			nlh->nlmsg_len = skb->len - sizeof(*nlh);
+			nlh->nlmsg_len = skb->len - NLMSG_SPACE(0);
 			skb_get(skb); /* because netlink_* frees */
 			retval = netlink_unicast(audit_sock, skb, audit_pid,
 						 MSG_DONTWAIT);