]> www.infradead.org Git - users/jedix/linux-maple.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)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 27 Feb 2017 23:04:13 +0000 (15:04 -0800)
commitbe7d69cb44e14b1957615c2c0eab9c8474247384
tree165c97ac54e6613c767e7249d04c503d17d708be
parent95001df09beef54e71f21509057559230bc6ea59
ipv4: keep skb->dst around in presence of IP options

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>
(cherry picked from commit 34b2cef20f19c87999fff3da4071e66937db9644)

Orabug: 25543766
CVE: CVE-2017-5970
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
net/ipv4/ip_sockglue.c