From b99fe4f68c44aecc54a0696010318c2c049c13c2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 8 Sep 2019 11:39:31 +0100 Subject: [PATCH] 4.9-stable patches added patches: mld-fix-memory-leak-in-mld_del_delrec.patch net-fix-skb-use-after-free-in-netpoll.patch net-stmmac-dwmac-rk-don-t-fail-if-phy-regulator-is-absent.patch tcp-inherit-timestamp-on-mtu-probe.patch --- ...ld-fix-memory-leak-in-mld_del_delrec.patch | 71 +++++++++++++++ ...et-fix-skb-use-after-free-in-netpoll.patch | 90 +++++++++++++++++++ ...on-t-fail-if-phy-regulator-is-absent.patch | 40 +++++++++ queue-4.9/series | 4 + .../tcp-inherit-timestamp-on-mtu-probe.patch | 47 ++++++++++ 5 files changed, 252 insertions(+) create mode 100644 queue-4.9/mld-fix-memory-leak-in-mld_del_delrec.patch create mode 100644 queue-4.9/net-fix-skb-use-after-free-in-netpoll.patch create mode 100644 queue-4.9/net-stmmac-dwmac-rk-don-t-fail-if-phy-regulator-is-absent.patch create mode 100644 queue-4.9/tcp-inherit-timestamp-on-mtu-probe.patch diff --git a/queue-4.9/mld-fix-memory-leak-in-mld_del_delrec.patch b/queue-4.9/mld-fix-memory-leak-in-mld_del_delrec.patch new file mode 100644 index 00000000000..a0192ed709f --- /dev/null +++ b/queue-4.9/mld-fix-memory-leak-in-mld_del_delrec.patch @@ -0,0 +1,71 @@ +From foo@baz Sun 08 Sep 2019 11:09:01 AM WEST +From: Eric Dumazet +Date: Tue, 27 Aug 2019 03:33:12 -0700 +Subject: mld: fix memory leak in mld_del_delrec() + +From: Eric Dumazet + +[ Upstream commit a84d016479896b5526a2cc54784e6ffc41c9d6f6 ] + +Similar to the fix done for IPv4 in commit e5b1c6c6277d +("igmp: fix memory leak in igmpv3_del_delrec()"), we need to +make sure mca_tomb and mca_sources are not blindly overwritten. + +Using swap() then a call to ip6_mc_clear_src() will take care +of the missing free. + +BUG: memory leak +unreferenced object 0xffff888117d9db00 (size 64): + comm "syz-executor247", pid 6918, jiffies 4294943989 (age 25.350s) + hex dump (first 32 bytes): + 00 00 00 00 00 00 00 00 fe 88 00 00 00 00 00 00 ................ + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + backtrace: + [<000000005b463030>] kmemleak_alloc_recursive include/linux/kmemleak.h:43 [inline] + [<000000005b463030>] slab_post_alloc_hook mm/slab.h:522 [inline] + [<000000005b463030>] slab_alloc mm/slab.c:3319 [inline] + [<000000005b463030>] kmem_cache_alloc_trace+0x145/0x2c0 mm/slab.c:3548 + [<00000000939cbf94>] kmalloc include/linux/slab.h:552 [inline] + [<00000000939cbf94>] kzalloc include/linux/slab.h:748 [inline] + [<00000000939cbf94>] ip6_mc_add1_src net/ipv6/mcast.c:2236 [inline] + [<00000000939cbf94>] ip6_mc_add_src+0x31f/0x420 net/ipv6/mcast.c:2356 + [<00000000d8972221>] ip6_mc_source+0x4a8/0x600 net/ipv6/mcast.c:449 + [<000000002b203d0d>] do_ipv6_setsockopt.isra.0+0x1b92/0x1dd0 net/ipv6/ipv6_sockglue.c:748 + [<000000001f1e2d54>] ipv6_setsockopt+0x89/0xd0 net/ipv6/ipv6_sockglue.c:944 + [<00000000c8f7bdf9>] udpv6_setsockopt+0x4e/0x90 net/ipv6/udp.c:1558 + [<000000005a9a0c5e>] sock_common_setsockopt+0x38/0x50 net/core/sock.c:3139 + [<00000000910b37b2>] __sys_setsockopt+0x10f/0x220 net/socket.c:2084 + [<00000000e9108023>] __do_sys_setsockopt net/socket.c:2100 [inline] + [<00000000e9108023>] __se_sys_setsockopt net/socket.c:2097 [inline] + [<00000000e9108023>] __x64_sys_setsockopt+0x26/0x30 net/socket.c:2097 + [<00000000f4818160>] do_syscall_64+0x76/0x1a0 arch/x86/entry/common.c:296 + [<000000008d367e8f>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 + +Fixes: 1666d49e1d41 ("mld: do not remove mld souce list info when set link down") +Fixes: 9c8bb163ae78 ("igmp, mld: Fix memory leak in igmpv3/mld_del_delrec()") +Signed-off-by: Eric Dumazet +Reported-by: syzbot +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv6/mcast.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/net/ipv6/mcast.c ++++ b/net/ipv6/mcast.c +@@ -772,12 +772,13 @@ static void mld_del_delrec(struct inet6_ + im->idev = pmc->idev; + im->mca_crcount = idev->mc_qrv; + if (im->mca_sfmode == MCAST_INCLUDE) { +- im->mca_tomb = pmc->mca_tomb; +- im->mca_sources = pmc->mca_sources; ++ swap(im->mca_tomb, pmc->mca_tomb); ++ swap(im->mca_sources, pmc->mca_sources); + for (psf = im->mca_sources; psf; psf = psf->sf_next) + psf->sf_crcount = im->mca_crcount; + } + in6_dev_put(pmc->idev); ++ ip6_mc_clear_src(pmc); + kfree(pmc); + } + spin_unlock_bh(&im->mca_lock); diff --git a/queue-4.9/net-fix-skb-use-after-free-in-netpoll.patch b/queue-4.9/net-fix-skb-use-after-free-in-netpoll.patch new file mode 100644 index 00000000000..92011302c62 --- /dev/null +++ b/queue-4.9/net-fix-skb-use-after-free-in-netpoll.patch @@ -0,0 +1,90 @@ +From foo@baz Sun 08 Sep 2019 11:14:16 AM WEST +From: Feng Sun +Date: Mon, 26 Aug 2019 14:46:04 +0800 +Subject: net: fix skb use after free in netpoll + +From: Feng Sun + +[ Upstream commit 2c1644cf6d46a8267d79ed95cb9b563839346562 ] + +After commit baeababb5b85d5c4e6c917efe2a1504179438d3b +("tun: return NET_XMIT_DROP for dropped packets"), +when tun_net_xmit drop packets, it will free skb and return NET_XMIT_DROP, +netpoll_send_skb_on_dev will run into following use after free cases: +1. retry netpoll_start_xmit with freed skb; +2. queue freed skb in npinfo->txq. +queue_process will also run into use after free case. + +hit netpoll_send_skb_on_dev first case with following kernel log: + +[ 117.864773] kernel BUG at mm/slub.c:306! +[ 117.864773] invalid opcode: 0000 [#1] SMP PTI +[ 117.864774] CPU: 3 PID: 2627 Comm: loop_printmsg Kdump: loaded Tainted: P OE 5.3.0-050300rc5-generic #201908182231 +[ 117.864775] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 +[ 117.864775] RIP: 0010:kmem_cache_free+0x28d/0x2b0 +[ 117.864781] Call Trace: +[ 117.864781] ? tun_net_xmit+0x21c/0x460 +[ 117.864781] kfree_skbmem+0x4e/0x60 +[ 117.864782] kfree_skb+0x3a/0xa0 +[ 117.864782] tun_net_xmit+0x21c/0x460 +[ 117.864782] netpoll_start_xmit+0x11d/0x1b0 +[ 117.864788] netpoll_send_skb_on_dev+0x1b8/0x200 +[ 117.864789] __br_forward+0x1b9/0x1e0 [bridge] +[ 117.864789] ? skb_clone+0x53/0xd0 +[ 117.864790] ? __skb_clone+0x2e/0x120 +[ 117.864790] deliver_clone+0x37/0x50 [bridge] +[ 117.864790] maybe_deliver+0x89/0xc0 [bridge] +[ 117.864791] br_flood+0x6c/0x130 [bridge] +[ 117.864791] br_dev_xmit+0x315/0x3c0 [bridge] +[ 117.864792] netpoll_start_xmit+0x11d/0x1b0 +[ 117.864792] netpoll_send_skb_on_dev+0x1b8/0x200 +[ 117.864792] netpoll_send_udp+0x2c6/0x3e8 +[ 117.864793] write_msg+0xd9/0xf0 [netconsole] +[ 117.864793] console_unlock+0x386/0x4e0 +[ 117.864793] vprintk_emit+0x17e/0x280 +[ 117.864794] vprintk_default+0x29/0x50 +[ 117.864794] vprintk_func+0x4c/0xbc +[ 117.864794] printk+0x58/0x6f +[ 117.864795] loop_fun+0x24/0x41 [printmsg_loop] +[ 117.864795] kthread+0x104/0x140 +[ 117.864795] ? 0xffffffffc05b1000 +[ 117.864796] ? kthread_park+0x80/0x80 +[ 117.864796] ret_from_fork+0x35/0x40 + +Signed-off-by: Feng Sun +Signed-off-by: Xiaojun Zhao +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/core/netpoll.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/net/core/netpoll.c ++++ b/net/core/netpoll.c +@@ -122,7 +122,7 @@ static void queue_process(struct work_st + txq = netdev_get_tx_queue(dev, q_index); + HARD_TX_LOCK(dev, txq, smp_processor_id()); + if (netif_xmit_frozen_or_stopped(txq) || +- netpoll_start_xmit(skb, dev, txq) != NETDEV_TX_OK) { ++ !dev_xmit_complete(netpoll_start_xmit(skb, dev, txq))) { + skb_queue_head(&npinfo->txq, skb); + HARD_TX_UNLOCK(dev, txq); + local_irq_restore(flags); +@@ -357,7 +357,7 @@ void netpoll_send_skb_on_dev(struct netp + + HARD_TX_UNLOCK(dev, txq); + +- if (status == NETDEV_TX_OK) ++ if (dev_xmit_complete(status)) + break; + + } +@@ -374,7 +374,7 @@ void netpoll_send_skb_on_dev(struct netp + + } + +- if (status != NETDEV_TX_OK) { ++ if (!dev_xmit_complete(status)) { + skb_queue_tail(&npinfo->txq, skb); + schedule_delayed_work(&npinfo->tx_work,0); + } diff --git a/queue-4.9/net-stmmac-dwmac-rk-don-t-fail-if-phy-regulator-is-absent.patch b/queue-4.9/net-stmmac-dwmac-rk-don-t-fail-if-phy-regulator-is-absent.patch new file mode 100644 index 00000000000..e6f470b57c9 --- /dev/null +++ b/queue-4.9/net-stmmac-dwmac-rk-don-t-fail-if-phy-regulator-is-absent.patch @@ -0,0 +1,40 @@ +From foo@baz Sun 08 Sep 2019 11:14:16 AM WEST +From: Chen-Yu Tsai +Date: Thu, 29 Aug 2019 11:17:24 +0800 +Subject: net: stmmac: dwmac-rk: Don't fail if phy regulator is absent + +From: Chen-Yu Tsai + +[ Upstream commit 3b25528e1e355c803e73aa326ce657b5606cda73 ] + +The devicetree binding lists the phy phy as optional. As such, the +driver should not bail out if it can't find a regulator. Instead it +should just skip the remaining regulator related code and continue +on normally. + +Skip the remainder of phy_power_on() if a regulator supply isn't +available. This also gets rid of the bogus return code. + +Fixes: 2e12f536635f ("net: stmmac: dwmac-rk: Use standard devicetree property for phy regulator") +Signed-off-by: Chen-Yu Tsai +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c ++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +@@ -771,10 +771,8 @@ static int phy_power_on(struct rk_priv_d + int ret; + struct device *dev = &bsp_priv->pdev->dev; + +- if (!ldo) { +- dev_err(dev, "no regulator found\n"); +- return -1; +- } ++ if (!ldo) ++ return 0; + + if (enable) { + ret = regulator_enable(ldo); diff --git a/queue-4.9/series b/queue-4.9/series index 956f3e337a9..1379988b780 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -20,3 +20,7 @@ spi-bcm2835aux-unifying-code-between-polling-and-int.patch spi-bcm2835aux-remove-dangerous-uncontrolled-read-of.patch spi-bcm2835aux-fix-corruptions-for-longer-spi-transf.patch revert-x86-apic-include-the-ldr-when-clearing-out-ap.patch +net-fix-skb-use-after-free-in-netpoll.patch +net-stmmac-dwmac-rk-don-t-fail-if-phy-regulator-is-absent.patch +tcp-inherit-timestamp-on-mtu-probe.patch +mld-fix-memory-leak-in-mld_del_delrec.patch diff --git a/queue-4.9/tcp-inherit-timestamp-on-mtu-probe.patch b/queue-4.9/tcp-inherit-timestamp-on-mtu-probe.patch new file mode 100644 index 00000000000..3c3ebc401b7 --- /dev/null +++ b/queue-4.9/tcp-inherit-timestamp-on-mtu-probe.patch @@ -0,0 +1,47 @@ +From foo@baz Sun 08 Sep 2019 11:14:16 AM WEST +From: Willem de Bruijn +Date: Tue, 27 Aug 2019 15:09:33 -0400 +Subject: tcp: inherit timestamp on mtu probe + +From: Willem de Bruijn + +[ Upstream commit 888a5c53c0d8be6e98bc85b677f179f77a647873 ] + +TCP associates tx timestamp requests with a byte in the bytestream. +If merging skbs in tcp_mtu_probe, migrate the tstamp request. + +Similar to MSG_EOR, do not allow moving a timestamp from any segment +in the probe but the last. This to avoid merging multiple timestamps. + +Tested with the packetdrill script at +https://github.com/wdebruij/packetdrill/commits/mtu_probe-1 + +Link: http://patchwork.ozlabs.org/patch/1143278/#2232897 +Fixes: 4ed2d765dfac ("net-timestamp: TCP timestamping") +Signed-off-by: Willem de Bruijn +Signed-off-by: Eric Dumazet +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv4/tcp_output.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -1943,7 +1943,7 @@ static bool tcp_can_coalesce_send_queue_ + if (len <= skb->len) + break; + +- if (unlikely(TCP_SKB_CB(skb)->eor)) ++ if (unlikely(TCP_SKB_CB(skb)->eor) || tcp_has_tx_tstamp(skb)) + return false; + + len -= skb->len; +@@ -2066,6 +2066,7 @@ static int tcp_mtu_probe(struct sock *sk + * we need to propagate it to the new skb. + */ + TCP_SKB_CB(nskb)->eor = TCP_SKB_CB(skb)->eor; ++ tcp_skb_collapse_tstamp(nskb, skb); + tcp_unlink_write_queue(skb, sk); + sk_wmem_free_skb(sk, skb); + } else { -- 2.47.3