Commit f668f5f7 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv4: use sk_fullsock() in ipv4_conntrack_defrag() 



Before converting a 'socket pointer' into inet socket,
use sk_fullsock() to detect timewait or request sockets.

Fixes: ca6fb065 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Tested-by: default avatarDmitry Vyukov <dvyukov@google.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 805c4bc0

net/ipv4/netfilter/nf_defrag_ipv4.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -67,10 +67,9 @@ static unsigned int ipv4_conntrack_defrag(void *priv, 
					  const struct nf_hook_state *state)

					  const struct nf_hook_state *state)

{

{

	struct sock *sk = skb->sk;

	struct sock *sk = skb->sk;

	struct inet_sock *inet = inet_sk(skb->sk);





	if (sk && (sk->sk_family == PF_INET) &&

	if (sk && sk_fullsock(sk) && (sk->sk_family == PF_INET) &&

	    inet->nodefrag)

	    inet_sk(sk)->nodefrag)

		return NF_ACCEPT;

		return NF_ACCEPT;





#if IS_ENABLED(CONFIG_NF_CONNTRACK)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)