From: Greg Kroah-Hartman Date: Sun, 9 Jun 2019 08:14:16 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.1.9~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88a4c464f89ef7041a85019aca8e52cd9e63399b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: ethtool-fix-potential-userspace-buffer-overflow.patch neighbor-call-__ipv4_neigh_lookup_noref-in-neigh_xmit.patch net-mlx4_en-ethtool-remove-unsupported-sfp-eeprom-high-pages-query.patch net-rds-fix-memory-leak-in-rds_ib_flush_mr_pool.patch pktgen-do-not-sleep-with-the-thread-lock-held.patch --- diff --git a/queue-4.4/ethtool-fix-potential-userspace-buffer-overflow.patch b/queue-4.4/ethtool-fix-potential-userspace-buffer-overflow.patch new file mode 100644 index 00000000000..a72114c6521 --- /dev/null +++ b/queue-4.4/ethtool-fix-potential-userspace-buffer-overflow.patch @@ -0,0 +1,54 @@ +From foo@baz Sun 09 Jun 2019 10:07:25 AM CEST +From: Vivien Didelot +Date: Mon, 3 Jun 2019 16:57:13 -0400 +Subject: ethtool: fix potential userspace buffer overflow + +From: Vivien Didelot + +[ Upstream commit 0ee4e76937d69128a6a66861ba393ebdc2ffc8a2 ] + +ethtool_get_regs() allocates a buffer of size ops->get_regs_len(), +and pass it to the kernel driver via ops->get_regs() for filling. + +There is no restriction about what the kernel drivers can or cannot do +with the open ethtool_regs structure. They usually set regs->version +and ignore regs->len or set it to the same size as ops->get_regs_len(). + +But if userspace allocates a smaller buffer for the registers dump, +we would cause a userspace buffer overflow in the final copy_to_user() +call, which uses the regs.len value potentially reset by the driver. + +To fix this, make this case obvious and store regs.len before calling +ops->get_regs(), to only copy as much data as requested by userspace, +up to the value returned by ops->get_regs_len(). + +While at it, remove the redundant check for non-null regbuf. + +Signed-off-by: Vivien Didelot +Reviewed-by: Michal Kubecek +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/core/ethtool.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/net/core/ethtool.c ++++ b/net/core/ethtool.c +@@ -893,13 +893,16 @@ static int ethtool_get_regs(struct net_d + return -ENOMEM; + } + ++ if (regs.len < reglen) ++ reglen = regs.len; ++ + ops->get_regs(dev, ®s, regbuf); + + ret = -EFAULT; + if (copy_to_user(useraddr, ®s, sizeof(regs))) + goto out; + useraddr += offsetof(struct ethtool_regs, data); +- if (regbuf && copy_to_user(useraddr, regbuf, regs.len)) ++ if (copy_to_user(useraddr, regbuf, reglen)) + goto out; + ret = 0; + diff --git a/queue-4.4/neighbor-call-__ipv4_neigh_lookup_noref-in-neigh_xmit.patch b/queue-4.4/neighbor-call-__ipv4_neigh_lookup_noref-in-neigh_xmit.patch new file mode 100644 index 00000000000..0d83ac2f19f --- /dev/null +++ b/queue-4.4/neighbor-call-__ipv4_neigh_lookup_noref-in-neigh_xmit.patch @@ -0,0 +1,57 @@ +From foo@baz Sun 09 Jun 2019 10:07:25 AM CEST +From: David Ahern +Date: Wed, 1 May 2019 18:18:42 -0700 +Subject: neighbor: Call __ipv4_neigh_lookup_noref in neigh_xmit + +From: David Ahern + +[ Upstream commit 4b2a2bfeb3f056461a90bd621e8bd7d03fa47f60 ] + +Commit cd9ff4de0107 changed the key for IFF_POINTOPOINT devices to +INADDR_ANY but neigh_xmit which is used for MPLS encapsulations was not +updated to use the altered key. The result is that every packet Tx does +a lookup on the gateway address which does not find an entry, a new one +is created only to find the existing one in the table right before the +insert since arp_constructor was updated to reset the primary key. This +is seen in the allocs and destroys counters: + ip -s -4 ntable show | head -10 | grep alloc + +which increase for each packet showing the unnecessary overhread. + +Fix by having neigh_xmit use __ipv4_neigh_lookup_noref for NEIGH_ARP_TABLE. + +Fixes: cd9ff4de0107 ("ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY") +Reported-by: Alan Maguire +Signed-off-by: David Ahern +Tested-by: Alan Maguire +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/core/neighbour.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/net/core/neighbour.c ++++ b/net/core/neighbour.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -2490,7 +2491,13 @@ int neigh_xmit(int index, struct net_dev + if (!tbl) + goto out; + rcu_read_lock_bh(); +- neigh = __neigh_lookup_noref(tbl, addr, dev); ++ if (index == NEIGH_ARP_TABLE) { ++ u32 key = *((u32 *)addr); ++ ++ neigh = __ipv4_neigh_lookup_noref(dev, key); ++ } else { ++ neigh = __neigh_lookup_noref(tbl, addr, dev); ++ } + if (!neigh) + neigh = __neigh_create(tbl, addr, dev, false); + err = PTR_ERR(neigh); diff --git a/queue-4.4/net-mlx4_en-ethtool-remove-unsupported-sfp-eeprom-high-pages-query.patch b/queue-4.4/net-mlx4_en-ethtool-remove-unsupported-sfp-eeprom-high-pages-query.patch new file mode 100644 index 00000000000..ac01b7cd108 --- /dev/null +++ b/queue-4.4/net-mlx4_en-ethtool-remove-unsupported-sfp-eeprom-high-pages-query.patch @@ -0,0 +1,60 @@ +From foo@baz Sun 09 Jun 2019 10:07:25 AM CEST +From: Erez Alfasi +Date: Mon, 20 May 2019 17:42:52 +0300 +Subject: net/mlx4_en: ethtool, Remove unsupported SFP EEPROM high pages query + +From: Erez Alfasi + +[ Upstream commit 135dd9594f127c8a82d141c3c8430e9e2143216a ] + +Querying EEPROM high pages data for SFP module is currently +not supported by our driver but is still tried, resulting in +invalid FW queries. + +Set the EEPROM ethtool data length to 256 for SFP module to +limit the reading for page 0 only and prevent invalid FW queries. + +Fixes: 7202da8b7f71 ("ethtool, net/mlx4_en: Cable info, get_module_info/eeprom ethtool support") +Signed-off-by: Erez Alfasi +Signed-off-by: Tariq Toukan +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 +++- + drivers/net/ethernet/mellanox/mlx4/port.c | 5 ----- + 2 files changed, 3 insertions(+), 6 deletions(-) + +--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c ++++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +@@ -1906,6 +1906,8 @@ static int mlx4_en_set_tunable(struct ne + return ret; + } + ++#define MLX4_EEPROM_PAGE_LEN 256 ++ + static int mlx4_en_get_module_info(struct net_device *dev, + struct ethtool_modinfo *modinfo) + { +@@ -1940,7 +1942,7 @@ static int mlx4_en_get_module_info(struc + break; + case MLX4_MODULE_ID_SFP: + modinfo->type = ETH_MODULE_SFF_8472; +- modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN; ++ modinfo->eeprom_len = MLX4_EEPROM_PAGE_LEN; + break; + default: + return -ENOSYS; +--- a/drivers/net/ethernet/mellanox/mlx4/port.c ++++ b/drivers/net/ethernet/mellanox/mlx4/port.c +@@ -1398,11 +1398,6 @@ int mlx4_get_module_info(struct mlx4_dev + size -= offset + size - I2C_PAGE_SIZE; + + i2c_addr = I2C_ADDR_LOW; +- if (offset >= I2C_PAGE_SIZE) { +- /* Reset offset to high page */ +- i2c_addr = I2C_ADDR_HIGH; +- offset -= I2C_PAGE_SIZE; +- } + + cable_info = (struct mlx4_cable_info *)inmad->data; + cable_info->dev_mem_address = cpu_to_be16(offset); diff --git a/queue-4.4/net-rds-fix-memory-leak-in-rds_ib_flush_mr_pool.patch b/queue-4.4/net-rds-fix-memory-leak-in-rds_ib_flush_mr_pool.patch new file mode 100644 index 00000000000..682fd55caa0 --- /dev/null +++ b/queue-4.4/net-rds-fix-memory-leak-in-rds_ib_flush_mr_pool.patch @@ -0,0 +1,90 @@ +From foo@baz Sun 09 Jun 2019 10:07:25 AM CEST +From: Zhu Yanjun +Date: Thu, 6 Jun 2019 04:00:03 -0400 +Subject: net: rds: fix memory leak in rds_ib_flush_mr_pool + +From: Zhu Yanjun + +[ Upstream commit 85cb928787eab6a2f4ca9d2a798b6f3bed53ced1 ] + +When the following tests last for several hours, the problem will occur. + +Server: + rds-stress -r 1.1.1.16 -D 1M +Client: + rds-stress -r 1.1.1.14 -s 1.1.1.16 -D 1M -T 30 + +The following will occur. + +" +Starting up.... +tsks tx/s rx/s tx+rx K/s mbi K/s mbo K/s tx us/c rtt us cpu +% + 1 0 0 0.00 0.00 0.00 0.00 0.00 -1.00 + 1 0 0 0.00 0.00 0.00 0.00 0.00 -1.00 + 1 0 0 0.00 0.00 0.00 0.00 0.00 -1.00 + 1 0 0 0.00 0.00 0.00 0.00 0.00 -1.00 +" +>From vmcore, we can find that clean_list is NULL. + +>From the source code, rds_mr_flushd calls rds_ib_mr_pool_flush_worker. +Then rds_ib_mr_pool_flush_worker calls +" + rds_ib_flush_mr_pool(pool, 0, NULL); +" +Then in function +" +int rds_ib_flush_mr_pool(struct rds_ib_mr_pool *pool, + int free_all, struct rds_ib_mr **ibmr_ret) +" +ibmr_ret is NULL. + +In the source code, +" +... +list_to_llist_nodes(pool, &unmap_list, &clean_nodes, &clean_tail); +if (ibmr_ret) + *ibmr_ret = llist_entry(clean_nodes, struct rds_ib_mr, llnode); + +/* more than one entry in llist nodes */ +if (clean_nodes->next) + llist_add_batch(clean_nodes->next, clean_tail, &pool->clean_list); +... +" +When ibmr_ret is NULL, llist_entry is not executed. clean_nodes->next +instead of clean_nodes is added in clean_list. +So clean_nodes is discarded. It can not be used again. +The workqueue is executed periodically. So more and more clean_nodes are +discarded. Finally the clean_list is NULL. +Then this problem will occur. + +Fixes: 1bc144b62524 ("net, rds, Replace xlist in net/rds/xlist.h with llist") +Signed-off-by: Zhu Yanjun +Acked-by: Santosh Shilimkar +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/rds/ib_rdma.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/net/rds/ib_rdma.c ++++ b/net/rds/ib_rdma.c +@@ -725,12 +725,14 @@ static int rds_ib_flush_mr_pool(struct r + wait_clean_list_grace(); + + list_to_llist_nodes(pool, &unmap_list, &clean_nodes, &clean_tail); +- if (ibmr_ret) ++ if (ibmr_ret) { + *ibmr_ret = llist_entry(clean_nodes, struct rds_ib_mr, llnode); +- ++ clean_nodes = clean_nodes->next; ++ } + /* more than one entry in llist nodes */ +- if (clean_nodes->next) +- llist_add_batch(clean_nodes->next, clean_tail, &pool->clean_list); ++ if (clean_nodes) ++ llist_add_batch(clean_nodes, clean_tail, ++ &pool->clean_list); + + } + diff --git a/queue-4.4/pktgen-do-not-sleep-with-the-thread-lock-held.patch b/queue-4.4/pktgen-do-not-sleep-with-the-thread-lock-held.patch new file mode 100644 index 00000000000..957c003d7b8 --- /dev/null +++ b/queue-4.4/pktgen-do-not-sleep-with-the-thread-lock-held.patch @@ -0,0 +1,96 @@ +From foo@baz Sun 09 Jun 2019 10:07:25 AM CEST +From: Paolo Abeni +Date: Thu, 6 Jun 2019 15:45:03 +0200 +Subject: pktgen: do not sleep with the thread lock held. + +From: Paolo Abeni + +[ Upstream commit 720f1de4021f09898b8c8443f3b3e995991b6e3a ] + +Currently, the process issuing a "start" command on the pktgen procfs +interface, acquires the pktgen thread lock and never release it, until +all pktgen threads are completed. The above can blocks indefinitely any +other pktgen command and any (even unrelated) netdevice removal - as +the pktgen netdev notifier acquires the same lock. + +The issue is demonstrated by the following script, reported by Matteo: + +ip -b - <<'EOF' + link add type dummy + link add type veth + link set dummy0 up +EOF +modprobe pktgen +echo reset >/proc/net/pktgen/pgctrl +{ + echo rem_device_all + echo add_device dummy0 +} >/proc/net/pktgen/kpktgend_0 +echo count 0 >/proc/net/pktgen/dummy0 +echo start >/proc/net/pktgen/pgctrl & +sleep 1 +rmmod veth + +Fix the above releasing the thread lock around the sleep call. + +Additionally we must prevent racing with forcefull rmmod - as the +thread lock no more protects from them. Instead, acquire a self-reference +before waiting for any thread. As a side effect, running + +rmmod pktgen + +while some thread is running now fails with "module in use" error, +before this patch such command hanged indefinitely. + +Note: the issue predates the commit reported in the fixes tag, but +this fix can't be applied before the mentioned commit. + +v1 -> v2: + - no need to check for thread existence after flipping the lock, + pktgen threads are freed only at net exit time + - + +Fixes: 6146e6a43b35 ("[PKTGEN]: Removes thread_{un,}lock() macros.") +Reported-and-tested-by: Matteo Croce +Signed-off-by: Paolo Abeni +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/core/pktgen.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/net/core/pktgen.c ++++ b/net/core/pktgen.c +@@ -3139,7 +3139,13 @@ static int pktgen_wait_thread_run(struct + { + while (thread_is_running(t)) { + ++ /* note: 't' will still be around even after the unlock/lock ++ * cycle because pktgen_thread threads are only cleared at ++ * net exit ++ */ ++ mutex_unlock(&pktgen_thread_lock); + msleep_interruptible(100); ++ mutex_lock(&pktgen_thread_lock); + + if (signal_pending(current)) + goto signal; +@@ -3154,6 +3160,10 @@ static int pktgen_wait_all_threads_run(s + struct pktgen_thread *t; + int sig = 1; + ++ /* prevent from racing with rmmod */ ++ if (!try_module_get(THIS_MODULE)) ++ return sig; ++ + mutex_lock(&pktgen_thread_lock); + + list_for_each_entry(t, &pn->pktgen_threads, th_list) { +@@ -3167,6 +3177,7 @@ static int pktgen_wait_all_threads_run(s + t->control |= (T_STOP); + + mutex_unlock(&pktgen_thread_lock); ++ module_put(THIS_MODULE); + return sig; + } + diff --git a/queue-4.4/series b/queue-4.4/series index 1b644954d3e..0d8eddfd2cc 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -226,3 +226,8 @@ revert-x86-build-move-_etext-to-actual-end-of-.text.patch net-cdc_ncm-getntbformat-endian-fix.patch usb-gadget-fix-request-length-error-for-isoc-transfer.patch media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch +ethtool-fix-potential-userspace-buffer-overflow.patch +neighbor-call-__ipv4_neigh_lookup_noref-in-neigh_xmit.patch +net-mlx4_en-ethtool-remove-unsupported-sfp-eeprom-high-pages-query.patch +net-rds-fix-memory-leak-in-rds_ib_flush_mr_pool.patch +pktgen-do-not-sleep-with-the-thread-lock-held.patch