diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-11-08 10:54:09 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-08 20:56:39 -0500 |
| commit | fdd723e2a856b6132d5e7beb2a2d3ec1e6a6297f (patch) | |
| tree | e7e93d020aea2a1dc9576df21e305cd33d6e933b /net | |
| parent | 8827d90e29e664aa959817467a3da72041ca2269 (diff) | |
| download | blackbird-op-linux-fdd723e2a856b6132d5e7beb2a2d3ec1e6a6297f.tar.gz blackbird-op-linux-fdd723e2a856b6132d5e7beb2a2d3ec1e6a6297f.zip | |
netfilter: xt_owner: use skb_to_full_sk() helper
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/xt_owner.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netfilter/xt_owner.c b/net/netfilter/xt_owner.c index ca2e577ed8ac..1302b475abcb 100644 --- a/net/netfilter/xt_owner.c +++ b/net/netfilter/xt_owner.c @@ -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; |
