Hi Eric,
After merging the userns tree, today's linux-next build (x86_64
allmodconfig) failed like this:
kernel/audit.c: In function 'audit_receive_msg':
kernel/audit.c:753:37: error: 'struct netlink_skb_parms' has no member named 'pid'
I missed the conflict between commit 35ce9888ad2a ("audit: Properly set
the origin port id of audit messages") from the userns tree and commit
15e473046cb6 ("netlink: Rename pid to portid to avoid confusion") from
the net-next tree. I have added the following merge fix patch and can
carry it as necessary.
From 55a9ee70146f37c559333b1f35154618c708203f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 24 Sep 2012 22:05:38 +1000
Subject: [PATCH] audit: fix up for pid to portid change
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
kernel/audit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/audit.c b/kernel/audit.c
index ea9b67a..4d0ceed 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -750,7 +750,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
size--;
audit_log_n_untrustedstring(ab, data, size);
}
- audit_set_pid(ab, NETLINK_CB(skb).pid);
+ audit_set_pid(ab, NETLINK_CB(skb).portid);
audit_log_end(ab);
}
break;
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp1qvqcyyPXW.pgp
Description: PGP signature
