* [PATCH net-next 1/1] ipv6: tcp: fix potential NULL deref in tcp_v6_send_reset()
@ 2019-06-07 19:23 Eric Dumazet
2019-06-10 2:42 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2019-06-07 19:23 UTC (permalink / raw)
To: David S . Miller; +Cc: netdev, Eric Dumazet, Eric Dumazet, syzbot
syzbot found a crash in tcp_v6_send_reset() caused by my latest
change.
Problem is that if an skb has been queued to socket prequeue,
skb_dst(skb)->dev can not anymore point to the device.
Fortunately in this case the socket pointer is not NULL.
A similar issue has been fixed in commit 0f85feae6b71 ("tcp: fix
more NULL deref after prequeue changes"), I should have known better.
Fixes: 323a53c41292 ("ipv6: tcp: enable flowlabel reflection in some RST packets")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
---
net/ipv6/tcp_ipv6.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index d8d18386c99a82e112dd3a1aeee01e4c328ba5d7..c1da52c7f990f2fa3e020e3f3a33934149ad225e 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -934,7 +934,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)
if (!sk && !ipv6_unicast_destination(skb))
return;
- net = dev_net(skb_dst(skb)->dev);
+ net = sk ? sock_net(sk) : dev_net(skb_dst(skb)->dev);
#ifdef CONFIG_TCP_MD5SIG
rcu_read_lock();
hash_location = tcp_parse_md5sig_option(th);
--
2.22.0.rc2.383.gf4fbbf30c2-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next 1/1] ipv6: tcp: fix potential NULL deref in tcp_v6_send_reset()
2019-06-07 19:23 [PATCH net-next 1/1] ipv6: tcp: fix potential NULL deref in tcp_v6_send_reset() Eric Dumazet
@ 2019-06-10 2:42 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-06-10 2:42 UTC (permalink / raw)
To: edumazet; +Cc: netdev, eric.dumazet, syzkaller
From: Eric Dumazet <edumazet@google.com>
Date: Fri, 7 Jun 2019 12:23:48 -0700
> syzbot found a crash in tcp_v6_send_reset() caused by my latest
> change.
>
> Problem is that if an skb has been queued to socket prequeue,
> skb_dst(skb)->dev can not anymore point to the device.
>
> Fortunately in this case the socket pointer is not NULL.
>
> A similar issue has been fixed in commit 0f85feae6b71 ("tcp: fix
> more NULL deref after prequeue changes"), I should have known better.
>
> Fixes: 323a53c41292 ("ipv6: tcp: enable flowlabel reflection in some RST packets")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Reported-by: syzbot <syzkaller@googlegroups.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-10 2:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-07 19:23 [PATCH net-next 1/1] ipv6: tcp: fix potential NULL deref in tcp_v6_send_reset() Eric Dumazet
2019-06-10 2:42 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).