diff options
| author | Stephen Suryaputra <ssuryaextr@gmail.com> | 2019-04-12 16:19:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-27 09:30:30 +0200 |
| commit | 6c2fa855d8178699706b1192db2f1f8102b0ba1e (patch) | |
| tree | bb03c5d666fbee910c9b13b992253dd97cd113f1 /net | |
| parent | c63dcecbc234de4e80d1f788cd3c8ef60024f75b (diff) | |
| download | linux-stable-6c2fa855d8178699706b1192db2f1f8102b0ba1e.tar.gz linux-stable-6c2fa855d8178699706b1192db2f1f8102b0ba1e.tar.bz2 linux-stable-6c2fa855d8178699706b1192db2f1f8102b0ba1e.zip | |
ipv4: recompile ip options in ipv4_link_failure
[ Upstream commit ed0de45a1008991fdaa27a0152befcb74d126a8b ]
Recompile IP options since IPCB may not be valid anymore when
ipv4_link_failure is called from arp_error_report.
Refer to the commit 3da1ed7ac398 ("net: avoid use IPCB in cipso_v4_error")
and the commit before that (9ef6b42ad6fd) for a similar issue.
Signed-off-by: Stephen Suryaputra <ssuryaextr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/route.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 5b2a8d04a8a0..98f30766e8f8 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1151,8 +1151,16 @@ static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie) static void ipv4_link_failure(struct sk_buff *skb) { struct rtable *rt; + struct ip_options opt; - icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0); + /* Recompile ip options since IPCB may not be valid anymore. + */ + memset(&opt, 0, sizeof(opt)); + opt.optlen = ip_hdr(skb)->ihl*4 - sizeof(struct iphdr); + if (__ip_options_compile(dev_net(skb->dev), &opt, skb, NULL)) + return; + + __icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0, &opt); rt = skb_rtable(skb); if (rt) |