linux-next: build failure after merge of the selinux tree

[Stephen Rothwell]

Hi Eric,

After merging the selinux tree, today's linux-next build (x86_64
allmodconfig) failed like this:

crypto/crypto_user.c: In function 'crypto_user_rcv_msg':
crypto/crypto_user.c:385:2: error: implicit declaration of function 'security_netlink_recv' [-Werror=implicit-function-declaration]

Caused by commit f452f33b1f3a ("security: remove the
security_netlink_recv hook as it is equivalent to capable()") interacting
with commit a38f7907b926 ("crypto: Add userspace configuration API")
which was added to Linus' tree before v3.2-rc1.

I applied the following (supplied) fix as a merge fix.

From: Eric Paris <eparis@xxxxxxxxxx>
Subject: selinux tree pull for 2012-01-05, known build issue
Date: Wed, 04 Jan 2012 17:47:18 -0500

I updated my SELinux tree which is based on 3.1.  I know there is a
build problem after it is merged with current Linus.  The following
patch is also needed as the security function is removed by my tree, but
this caller was added by someone else.  I figured you could carry this
patch and I'd make sure Linus does the same when he merges...

diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index 0605a2b..c7e5b66 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -382,7 +382,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 	type -= CRYPTO_MSG_BASE;
 	link = &crypto_dispatch[type];
 
-	if (security_netlink_recv(skb, CAP_NET_ADMIN))
+	if (!capable(CAP_NET_ADMIN))
 		return -EPERM;
 
 	if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) &&


-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature