summaryrefslogtreecommitdiff
path: root/include/net/ipconfig.h
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-02-04 11:16:52 -0800
committerDavid S. Miller <davem@davemloft.net>2017-02-04 19:42:28 -0500
commit34b2cef20f19c87999fff3da4071e66937db9644 (patch)
tree8511da9643a776f79e6ec8e99bf438444e19c49c /include/net/ipconfig.h
parent5fa8bbda38c668e56b0c6cdecced2eac2fe36dec (diff)
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>
Diffstat (limited to 'include/net/ipconfig.h')
0 files changed, 0 insertions, 0 deletions
x/net-next.git/commit/net?id=6d04dfc8966019b8b0977b2cb942351f13d2b178'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds10-103/+86 2017-02-01net/sched: act_psample: Remove unnecessary ASSERT_RTNLYotam Gigi1-1/+0 2017-02-01net/sched: act_sample: Fix error path in initYotam Gigi1-1/+4 2017-02-01tcp: fix 0 divide in __tcp_select_window()Eric Dumazet1-2/+4 2017-02-01ipv6: pointer math error in ip6_tnl_parse_tlv_enc_lim()Dan Carpenter1-1/+1 2017-02-01net: ipv6: add NLM_F_APPEND in notifications when applicableDavid Ahern1-0/+3 2017-02-01net: reduce skb_warn_bad_offload() noiseEric Dumazet1-3/+9 2017-02-01net/sched: matchall: Fix configuration raceYotam Gigi1-82/+45 2017-02-01rtnetlink: Handle IFLA_MASTER parameter when processing rtnl_newlinkTheuns Verwoerd1-1/+6