netfilter: xt_owner: use skb_to_full_sk() helper
authorEric Dumazet <edumazet@google.com>
Sun, 8 Nov 2015 18:54:09 +0000 (10:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Nov 2015 01:56:39 +0000 (20:56 -0500)
SYNACK packets might be attached to a request socket,
xt_owner wants to gte the listener in this case.

Fixes: ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/xt_owner.c

index ca2e577ed8ac196caca1190d9ae65557bd5ab8ed..1302b475abcbe0c6c2f7c93d416635005ae9b91f 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/skbuff.h>
 #include <linux/file.h>
 #include <net/sock.h>
+#include <net/inet_sock.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_owner.h>
 
@@ -33,8 +34,9 @@ owner_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
        const struct xt_owner_match_info *info = par->matchinfo;
        const struct file *filp;
+       struct sock *sk = skb_to_full_sk(skb);
 
-       if (skb->sk == NULL || skb->sk->sk_socket == NULL)
+       if (sk == NULL || sk->sk_socket == NULL)
                return (info->match ^ info->invert) == 0;
        else if (info->match & info->invert & XT_OWNER_SOCKET)
                /*
@@ -43,7 +45,7 @@ owner_mt(const struct sk_buff *skb, struct xt_action_param *par)
                 */
                return false;
 
-       filp = skb->sk->sk_socket->file;
+       filp = sk->sk_socket->file;
        if (filp == NULL)
                return ((info->match ^ info->invert) &
                       (XT_OWNER_UID | XT_OWNER_GID)) == 0;