Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal

[karo-tx-linux.git] / net / netfilter / nfnetlink.c

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 027f16af51a0f1bde86b1805259166b4befa18ff..046aa13b4fea6a570b990444b7ca4c6419824f8f 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -363,13 +363,15 @@ static void nfnetlink_rcv(struct sk_buff *skb)
        struct net *net = sock_net(skb->sk);
        int msglen;
 
-       if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
-               return netlink_ack(skb, nlh, -EPERM);
-
        if (nlh->nlmsg_len < NLMSG_HDRLEN ||
            skb->len < nlh->nlmsg_len)
                return;
 
+       if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) {
+               netlink_ack(skb, nlh, -EPERM);
+               return;
+       }
+
        if (nlh->nlmsg_type == NFNL_MSG_BATCH_BEGIN) {
                struct nfgenmsg *nfgenmsg;