]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ipv4: keep skb->dst around in presence of IP options
authorEric Dumazet <edumazet@google.com>
Sat, 4 Feb 2017 19:16:52 +0000 (11:16 -0800)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:46:58 +0000 (00:46 +0200)
commit050c309794e9e68319843d452196994bcbde245f
tree6cab82d4ef1b654c3aa6c576737d27366d2e8e39
parentefca6f526324ac56ff6611d616727dbb4858e9fe
ipv4: keep skb->dst around in presence of IP options

commit 34b2cef20f19c87999fff3da4071e66937db9644 upstream.

Andrey Konovalov got crashes in __ip_options_echo() when a NULL skb->dst
is accessed.

ipv4_pktinfo_prepare() should not drop the dst if (evil) IP options
are present.

We could refine the test to the presence of ts_needtime or srr,
but IP options are not often used, so let's be conservative.

Thanks to syzkaller team for finding this bug.

Fixes: d826eb14ecef ("ipv4: PKTINFO doesnt need dst reference")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
net/ipv4/ip_sockglue.c