From: Greg Kroah-Hartman Date: Thu, 16 Nov 2017 15:02:47 +0000 (+0100) Subject: 3.18-stable patches X-Git-Tag: v3.18.82~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81d9d2514d5eea789b2818a1039e7f5b1aaa14a1;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: ip6_gre-only-increase-err_count-for-some-certain-type-icmpv6-in-ip6gre_err.patch ipip-only-increase-err_count-for-some-certain-type-icmp-in-ipip_err.patch ipv6-flowlabel-do-not-leave-opt-tot_len-with-garbage.patch --- diff --git a/queue-3.18/ip6_gre-only-increase-err_count-for-some-certain-type-icmpv6-in-ip6gre_err.patch b/queue-3.18/ip6_gre-only-increase-err_count-for-some-certain-type-icmpv6-in-ip6gre_err.patch new file mode 100644 index 00000000000..59f5f808dab --- /dev/null +++ b/queue-3.18/ip6_gre-only-increase-err_count-for-some-certain-type-icmpv6-in-ip6gre_err.patch @@ -0,0 +1,62 @@ +From foo@baz Thu Nov 16 15:49:43 CET 2017 +From: Xin Long +Date: Thu, 26 Oct 2017 19:23:27 +0800 +Subject: ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err + +From: Xin Long + + +[ Upstream commit f8d20b46ce55cf40afb30dcef6d9288f7ef46d9b ] + +The similar fix in patch 'ipip: only increase err_count for some +certain type icmp in ipip_err' is needed for ip6gre_err. + +In Jianlin's case, udp netperf broke even when receiving a TooBig +icmpv6 packet. + +Fixes: c12b395a4664 ("gre: Support GRE over IPv6") +Reported-by: Jianlin Shi +Signed-off-by: Xin Long +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv6/ip6_gre.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +--- a/net/ipv6/ip6_gre.c ++++ b/net/ipv6/ip6_gre.c +@@ -409,13 +409,16 @@ static void ip6gre_err(struct sk_buff *s + case ICMPV6_DEST_UNREACH: + net_warn_ratelimited("%s: Path to destination invalid or inactive!\n", + t->parms.name); +- break; ++ if (code != ICMPV6_PORT_UNREACH) ++ break; ++ return; + case ICMPV6_TIME_EXCEED: + if (code == ICMPV6_EXC_HOPLIMIT) { + net_warn_ratelimited("%s: Too small hop limit or routing loop in tunnel!\n", + t->parms.name); ++ break; + } +- break; ++ return; + case ICMPV6_PARAMPROB: + teli = 0; + if (code == ICMPV6_HDR_FIELD) +@@ -431,13 +434,13 @@ static void ip6gre_err(struct sk_buff *s + net_warn_ratelimited("%s: Recipient unable to parse tunneled packet!\n", + t->parms.name); + } +- break; ++ return; + case ICMPV6_PKT_TOOBIG: + mtu = be32_to_cpu(info) - offset; + if (mtu < IPV6_MIN_MTU) + mtu = IPV6_MIN_MTU; + t->dev->mtu = mtu; +- break; ++ return; + } + + if (time_before(jiffies, t->err_time + IP6TUNNEL_ERR_TIMEO)) diff --git a/queue-3.18/ipip-only-increase-err_count-for-some-certain-type-icmp-in-ipip_err.patch b/queue-3.18/ipip-only-increase-err_count-for-some-certain-type-icmp-in-ipip_err.patch new file mode 100644 index 00000000000..cb28e7ba7a4 --- /dev/null +++ b/queue-3.18/ipip-only-increase-err_count-for-some-certain-type-icmp-in-ipip_err.patch @@ -0,0 +1,128 @@ +From foo@baz Thu Nov 16 15:49:43 CET 2017 +From: Xin Long +Date: Thu, 26 Oct 2017 19:19:56 +0800 +Subject: ipip: only increase err_count for some certain type icmp in ipip_err + +From: Xin Long + + +[ Upstream commit f3594f0a7ea36661d7fd942facd7f31a64245f1a ] + +t->err_count is used to count the link failure on tunnel and an err +will be reported to user socket in tx path if t->err_count is not 0. +udp socket could even return EHOSTUNREACH to users. + +Since commit fd58156e456d ("IPIP: Use ip-tunneling code.") removed +the 'switch check' for icmp type in ipip_err(), err_count would be +increased by the icmp packet with ICMP_EXC_FRAGTIME code. an link +failure would be reported out due to this. + +In Jianlin's case, when receiving ICMP_EXC_FRAGTIME a icmp packet, +udp netperf failed with the err: + send_data: data send error: No route to host (errno 113) + +We expect this error reported from tunnel to socket when receiving +some certain type icmp, but not ICMP_EXC_FRAGTIME, ICMP_SR_FAILED +or ICMP_PARAMETERPROB ones. + +This patch is to bring 'switch check' for icmp type back to ipip_err +so that it only reports link failure for the right type icmp, just as +in ipgre_err() and ipip6_err(). + +Fixes: fd58156e456d ("IPIP: Use ip-tunneling code.") +Reported-by: Jianlin Shi +Signed-off-by: Xin Long +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv4/ipip.c | 59 +++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 42 insertions(+), 17 deletions(-) + +--- a/net/ipv4/ipip.c ++++ b/net/ipv4/ipip.c +@@ -128,43 +128,68 @@ static struct rtnl_link_ops ipip_link_op + + static int ipip_err(struct sk_buff *skb, u32 info) + { +- +-/* All the routers (except for Linux) return only +- 8 bytes of packet payload. It means, that precise relaying of +- ICMP in the real Internet is absolutely infeasible. +- */ ++ /* All the routers (except for Linux) return only ++ 8 bytes of packet payload. It means, that precise relaying of ++ ICMP in the real Internet is absolutely infeasible. ++ */ + struct net *net = dev_net(skb->dev); + struct ip_tunnel_net *itn = net_generic(net, ipip_net_id); + const struct iphdr *iph = (const struct iphdr *)skb->data; +- struct ip_tunnel *t; +- int err; + const int type = icmp_hdr(skb)->type; + const int code = icmp_hdr(skb)->code; ++ struct ip_tunnel *t; ++ int err = 0; ++ ++ switch (type) { ++ case ICMP_DEST_UNREACH: ++ switch (code) { ++ case ICMP_SR_FAILED: ++ /* Impossible event. */ ++ goto out; ++ default: ++ /* All others are translated to HOST_UNREACH. ++ * rfc2003 contains "deep thoughts" about NET_UNREACH, ++ * I believe they are just ether pollution. --ANK ++ */ ++ break; ++ } ++ break; ++ ++ case ICMP_TIME_EXCEEDED: ++ if (code != ICMP_EXC_TTL) ++ goto out; ++ break; ++ ++ case ICMP_REDIRECT: ++ break; ++ ++ default: ++ goto out; ++ } + +- err = -ENOENT; + t = ip_tunnel_lookup(itn, skb->dev->ifindex, TUNNEL_NO_KEY, + iph->daddr, iph->saddr, 0); +- if (t == NULL) ++ if (!t) { ++ err = -ENOENT; + goto out; ++ } + + if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { +- ipv4_update_pmtu(skb, dev_net(skb->dev), info, +- t->parms.link, 0, IPPROTO_IPIP, 0); +- err = 0; ++ ipv4_update_pmtu(skb, net, info, t->parms.link, 0, ++ iph->protocol, 0); + goto out; + } + + if (type == ICMP_REDIRECT) { +- ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0, +- IPPROTO_IPIP, 0); +- err = 0; ++ ipv4_redirect(skb, net, t->parms.link, 0, iph->protocol, 0); + goto out; + } + +- if (t->parms.iph.daddr == 0) ++ if (t->parms.iph.daddr == 0) { ++ err = -ENOENT; + goto out; ++ } + +- err = 0; + if (t->parms.iph.ttl == 0 && type == ICMP_TIME_EXCEEDED) + goto out; + diff --git a/queue-3.18/ipv6-flowlabel-do-not-leave-opt-tot_len-with-garbage.patch b/queue-3.18/ipv6-flowlabel-do-not-leave-opt-tot_len-with-garbage.patch new file mode 100644 index 00000000000..74d325c3990 --- /dev/null +++ b/queue-3.18/ipv6-flowlabel-do-not-leave-opt-tot_len-with-garbage.patch @@ -0,0 +1,104 @@ +From foo@baz Thu Nov 16 15:49:43 CET 2017 +From: Eric Dumazet +Date: Sat, 21 Oct 2017 12:26:23 -0700 +Subject: ipv6: flowlabel: do not leave opt->tot_len with garbage + +From: Eric Dumazet + + +[ Upstream commit 864e2a1f8aac05effac6063ce316b480facb46ff ] + +When syzkaller team brought us a C repro for the crash [1] that +had been reported many times in the past, I finally could find +the root cause. + +If FlowLabel info is merged by fl6_merge_options(), we leave +part of the opt_space storage provided by udp/raw/l2tp with random value +in opt_space.tot_len, unless a control message was provided at sendmsg() +time. + +Then ip6_setup_cork() would use this random value to perform a kzalloc() +call. Undefined behavior and crashes. + +Fix is to properly set tot_len in fl6_merge_options() + +At the same time, we can also avoid consuming memory and cpu cycles +to clear it, if every option is copied via a kmemdup(). This is the +change in ip6_setup_cork(). + +[1] +kasan: CONFIG_KASAN_INLINE enabled +kasan: GPF could be caused by NULL-ptr deref or user memory access +general protection fault: 0000 [#1] SMP KASAN +Dumping ftrace buffer: + (ftrace buffer empty) +Modules linked in: +CPU: 0 PID: 6613 Comm: syz-executor0 Not tainted 4.14.0-rc4+ #127 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 +task: ffff8801cb64a100 task.stack: ffff8801cc350000 +RIP: 0010:ip6_setup_cork+0x274/0x15c0 net/ipv6/ip6_output.c:1168 +RSP: 0018:ffff8801cc357550 EFLAGS: 00010203 +RAX: dffffc0000000000 RBX: ffff8801cc357748 RCX: 0000000000000010 +RDX: 0000000000000002 RSI: ffffffff842bd1d9 RDI: 0000000000000014 +RBP: ffff8801cc357620 R08: ffff8801cb17f380 R09: ffff8801cc357b10 +R10: ffff8801cb64a100 R11: 0000000000000000 R12: ffff8801cc357ab0 +R13: ffff8801cc357b10 R14: 0000000000000000 R15: ffff8801c3bbf0c0 +FS: 00007f9c5c459700(0000) GS:ffff8801db200000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 0000000020324000 CR3: 00000001d1cf2000 CR4: 00000000001406f0 +DR0: 0000000020001010 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000600 +Call Trace: + ip6_make_skb+0x282/0x530 net/ipv6/ip6_output.c:1729 + udpv6_sendmsg+0x2769/0x3380 net/ipv6/udp.c:1340 + inet_sendmsg+0x11f/0x5e0 net/ipv4/af_inet.c:762 + sock_sendmsg_nosec net/socket.c:633 [inline] + sock_sendmsg+0xca/0x110 net/socket.c:643 + SYSC_sendto+0x358/0x5a0 net/socket.c:1750 + SyS_sendto+0x40/0x50 net/socket.c:1718 + entry_SYSCALL_64_fastpath+0x1f/0xbe +RIP: 0033:0x4520a9 +RSP: 002b:00007f9c5c458c08 EFLAGS: 00000216 ORIG_RAX: 000000000000002c +RAX: ffffffffffffffda RBX: 0000000000718000 RCX: 00000000004520a9 +RDX: 0000000000000001 RSI: 0000000020fd1000 RDI: 0000000000000016 +RBP: 0000000000000086 R08: 0000000020e0afe4 R09: 000000000000001c +R10: 0000000000000000 R11: 0000000000000216 R12: 00000000004bb1ee +R13: 00000000ffffffff R14: 0000000000000016 R15: 0000000000000029 +Code: e0 07 83 c0 03 38 d0 7c 08 84 d2 0f 85 ea 0f 00 00 48 8d 79 04 48 b8 00 00 00 00 00 fc ff df 45 8b 74 24 04 48 89 fa 48 c1 ea 03 <0f> b6 14 02 48 89 f8 83 e0 07 83 c0 03 38 d0 7c 08 84 d2 0f 85 +RIP: ip6_setup_cork+0x274/0x15c0 net/ipv6/ip6_output.c:1168 RSP: ffff8801cc357550 + +Signed-off-by: Eric Dumazet +Reported-by: Dmitry Vyukov +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv6/ip6_flowlabel.c | 1 + + net/ipv6/ip6_output.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +--- a/net/ipv6/ip6_flowlabel.c ++++ b/net/ipv6/ip6_flowlabel.c +@@ -316,6 +316,7 @@ struct ipv6_txoptions *fl6_merge_options + } + opt_space->dst1opt = fopt->dst1opt; + opt_space->opt_flen = fopt->opt_flen; ++ opt_space->tot_len = fopt->tot_len; + return opt_space; + } + EXPORT_SYMBOL_GPL(fl6_merge_options); +--- a/net/ipv6/ip6_output.c ++++ b/net/ipv6/ip6_output.c +@@ -1177,11 +1177,11 @@ int ip6_append_data(struct sock *sk, int + if (WARN_ON(np->cork.opt)) + return -EINVAL; + +- np->cork.opt = kzalloc(opt->tot_len, sk->sk_allocation); ++ np->cork.opt = kzalloc(sizeof(*opt), sk->sk_allocation); + if (unlikely(np->cork.opt == NULL)) + return -ENOBUFS; + +- np->cork.opt->tot_len = opt->tot_len; ++ np->cork.opt->tot_len = sizeof(*opt); + np->cork.opt->opt_flen = opt->opt_flen; + np->cork.opt->opt_nflen = opt->opt_nflen; + diff --git a/queue-3.18/series b/queue-3.18/series index 7a4c8de8f87..e92797a5a13 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -13,3 +13,6 @@ sctp-add-the-missing-sock_owned_by_user-check-in-sctp_icmp_redirect.patch net-unix-don-t-show-information-about-sockets-from-other-namespaces.patch tun-allow-positive-return-values-on-dev_get_valid_name-call.patch sctp-reset-owner-sk-for-data-chunks-on-out-queues-when-migrating-a-sock.patch +ipv6-flowlabel-do-not-leave-opt-tot_len-with-garbage.patch +ipip-only-increase-err_count-for-some-certain-type-icmp-in-ipip_err.patch +ip6_gre-only-increase-err_count-for-some-certain-type-icmpv6-in-ip6gre_err.patch