Commit b4d1605a authored Dec 03, 2017 by David Ahern Committed by David S. Miller Dec 03, 2017

tcp: use IPCB instead of TCP_SKB_CB in inet_exact_dif_match()

After this fix : ("tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb()"),
socket lookups happen while skb->cb[] has not been mangled yet by TCP.

Fixes: a04a480d ("net: Require exact match for TCP socket lookups if dif is l3mdev")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent eeea10b8

include/net/tcp.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -844,12 +844,11 @@ static inline int tcp_v6_sdif(const struct sk_buff *skb)
		}
		#endif

		/* TCP_SKB_CB reference means this can not be used from early demux */
		static inline bool inet_exact_dif_match(struct net net, struct sk_buff skb)
		{
		#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)
		if (!net->ipv4.sysctl_tcp_l3mdev_accept &&
		skb && ipv4_l3mdev_skb(TCP_SKB_CB(skb)->header.h4.flags))
		skb && ipv4_l3mdev_skb(IPCB(skb)->flags))
		return true;
		#endif
		return false;