ipv6: inet6_sk() should use sk_fullsock()

edumazet · davem330 · commit e7eadb4de9e6 · 2015-10-05T02:45:25.000-07:00
SYN_RECV & TIMEWAIT sockets are not full blown, they do not have a pinet6 pointer. Fixes: ca6fb06 ("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>
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
@@ -264,9 +264,9 @@ struct tcp6_timewait_sock {
 };
 
 #if IS_ENABLED(CONFIG_IPV6)
-static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)
+static inline struct ipv6_pinfo *inet6_sk(const struct sock *__sk)
 {
-	return inet_sk(__sk)->pinet6;
+	return sk_fullsock(__sk) ? inet_sk(__sk)->pinet6 : NULL;
 }
 
 static inline struct raw6_sock *raw6_sk(const struct sock *sk)

Original file line number	Diff line number	Diff line change
`@@ -264,9 +264,9 @@ struct tcp6_timewait_sock {`
`264`	`264`	`};`
`265`	`265`
`266`	`266`	`#if IS_ENABLED(CONFIG_IPV6)`
`267`		`-static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)`
	`267`	`+static inline struct ipv6_pinfo inet6_sk(const struct sock __sk)`
`268`	`268`	`{`
`269`		`- return inet_sk(__sk)->pinet6;`
	`269`	`+ return sk_fullsock(__sk) ? inet_sk(__sk)->pinet6 : NULL;`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`static inline struct raw6_sock raw6_sk(const struct sock sk)`