Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / security / selinux / hooks.c

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 7171a957b9335694c1bbd1c5c9a41e2ec13bbda9..bf889ee51509654f1ac6550a54eec7cfa6be861d 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -61,7 +61,7 @@
 #include <linux/bitops.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>   /* for network interface checks */
-#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/dccp.h>
@@ -4481,7 +4481,7 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb)
        struct nlmsghdr *nlh;
        struct sk_security_struct *sksec = sk->sk_security;
 
-       if (skb->len < NLMSG_SPACE(0)) {
+       if (skb->len < NLMSG_HDRLEN) {
                err = -EINVAL;
                goto out;
        }