From: Sasha Levin Date: Sun, 6 Jun 2021 20:55:37 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v4.4.272~85 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59f2bddf377c0d387611a4f15095c58933fee3a3;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/efi-cper-fix-snprintf-use-in-cper_dimm_err_location.patch b/queue-4.4/efi-cper-fix-snprintf-use-in-cper_dimm_err_location.patch new file mode 100644 index 00000000000..c63cc1bcf4f --- /dev/null +++ b/queue-4.4/efi-cper-fix-snprintf-use-in-cper_dimm_err_location.patch @@ -0,0 +1,52 @@ +From 9382d26556b355ff82464fc677249e8181d2233c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 Apr 2021 21:46:36 +0200 +Subject: efi: cper: fix snprintf() use in cper_dimm_err_location() + +From: Rasmus Villemoes + +[ Upstream commit 942859d969de7f6f7f2659a79237a758b42782da ] + +snprintf() should be given the full buffer size, not one less. And it +guarantees nul-termination, so doing it manually afterwards is +pointless. + +It's even potentially harmful (though probably not in practice because +CPER_REC_LEN is 256), due to the "return how much would have been +written had the buffer been big enough" semantics. I.e., if the bank +and/or device strings are long enough that the "DIMM location ..." +output gets truncated, writing to msg[n] is a buffer overflow. + +Signed-off-by: Rasmus Villemoes +Fixes: 3760cd20402d4 ("CPER: Adjust code flow of some functions") +Signed-off-by: Ard Biesheuvel +Signed-off-by: Sasha Levin +--- + drivers/firmware/efi/cper.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c +index c0e54396f250..dc8d2603612e 100644 +--- a/drivers/firmware/efi/cper.c ++++ b/drivers/firmware/efi/cper.c +@@ -257,8 +257,7 @@ static int cper_dimm_err_location(struct cper_mem_err_compact *mem, char *msg) + if (!msg || !(mem->validation_bits & CPER_MEM_VALID_MODULE_HANDLE)) + return 0; + +- n = 0; +- len = CPER_REC_LEN - 1; ++ len = CPER_REC_LEN; + dmi_memdev_name(mem->mem_dev_handle, &bank, &device); + if (bank && device) + n = snprintf(msg, len, "DIMM location: %s %s ", bank, device); +@@ -267,7 +266,6 @@ static int cper_dimm_err_location(struct cper_mem_err_compact *mem, char *msg) + "DIMM location: not present. DMI handle: 0x%.4x ", + mem->mem_dev_handle); + +- msg[n] = '\0'; + return n; + } + +-- +2.30.2 + diff --git a/queue-4.4/hid-pidff-fix-error-return-code-in-hid_pidff_init.patch b/queue-4.4/hid-pidff-fix-error-return-code-in-hid_pidff_init.patch new file mode 100644 index 00000000000..74e7ff0d5c9 --- /dev/null +++ b/queue-4.4/hid-pidff-fix-error-return-code-in-hid_pidff_init.patch @@ -0,0 +1,36 @@ +From 48cab278a4d6cc27f3562d1a032c561754c3d022 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 May 2021 10:47:37 +0800 +Subject: HID: pidff: fix error return code in hid_pidff_init() + +From: Zhen Lei + +[ Upstream commit 3dd653c077efda8152f4dd395359617d577a54cd ] + +Fix to return a negative error code from the error handling +case instead of 0, as done elsewhere in this function. + +Fixes: 224ee88fe395 ("Input: add force feedback driver for PID devices") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/usbhid/hid-pidff.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c +index 08174d341f4a..bc75f1efa0f4 100644 +--- a/drivers/hid/usbhid/hid-pidff.c ++++ b/drivers/hid/usbhid/hid-pidff.c +@@ -1304,6 +1304,7 @@ int hid_pidff_init(struct hid_device *hid) + + if (pidff->pool[PID_DEVICE_MANAGED_POOL].value && + pidff->pool[PID_DEVICE_MANAGED_POOL].value[0] == 0) { ++ error = -EPERM; + hid_notice(hid, + "device does not support device managed pool\n"); + goto fail; +-- +2.30.2 + diff --git a/queue-4.4/ieee802154-fix-error-return-code-in-ieee802154_add_i.patch b/queue-4.4/ieee802154-fix-error-return-code-in-ieee802154_add_i.patch new file mode 100644 index 00000000000..e55bb2fce29 --- /dev/null +++ b/queue-4.4/ieee802154-fix-error-return-code-in-ieee802154_add_i.patch @@ -0,0 +1,41 @@ +From ec9ce9df31979ebb32874a89f724133fa63bda1d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 May 2021 14:25:17 +0800 +Subject: ieee802154: fix error return code in ieee802154_add_iface() + +From: Zhen Lei + +[ Upstream commit 79c6b8ed30e54b401c873dbad2511f2a1c525fd5 ] + +Fix to return a negative error code from the error handling +case instead of 0, as done elsewhere in this function. + +Fixes: be51da0f3e34 ("ieee802154: Stop using NLA_PUT*().") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Link: https://lore.kernel.org/r/20210508062517.2574-1-thunder.leizhen@huawei.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Sasha Levin +--- + net/ieee802154/nl-phy.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c +index 77d73014bde3..11f53dc0c1c0 100644 +--- a/net/ieee802154/nl-phy.c ++++ b/net/ieee802154/nl-phy.c +@@ -249,8 +249,10 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) + } + + if (nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) || +- nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name)) ++ nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name)) { ++ rc = -EMSGSIZE; + goto nla_put_failure; ++ } + dev_put(dev); + + wpan_phy_put(phy); +-- +2.30.2 + diff --git a/queue-4.4/ieee802154-fix-error-return-code-in-ieee802154_llsec.patch b/queue-4.4/ieee802154-fix-error-return-code-in-ieee802154_llsec.patch new file mode 100644 index 00000000000..a93ad97fef4 --- /dev/null +++ b/queue-4.4/ieee802154-fix-error-return-code-in-ieee802154_llsec.patch @@ -0,0 +1,41 @@ +From 75d131323d2bc2c29a9d855ab23ce44961d1237a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 May 2021 14:16:14 +0000 +Subject: ieee802154: fix error return code in ieee802154_llsec_getparams() + +From: Wei Yongjun + +[ Upstream commit 373e864cf52403b0974c2f23ca8faf9104234555 ] + +Fix to return negative error code -ENOBUFS from the error handling +case instead of 0, as done elsewhere in this function. + +Fixes: 3e9c156e2c21 ("ieee802154: add netlink interfaces for llsec") +Reported-by: Hulk Robot +Signed-off-by: Wei Yongjun +Link: https://lore.kernel.org/r/20210519141614.3040055-1-weiyongjun1@huawei.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Sasha Levin +--- + net/ieee802154/nl-mac.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c +index 76691a07a2e0..fe31df8dc804 100644 +--- a/net/ieee802154/nl-mac.c ++++ b/net/ieee802154/nl-mac.c +@@ -685,8 +685,10 @@ int ieee802154_llsec_getparams(struct sk_buff *skb, struct genl_info *info) + nla_put_u8(msg, IEEE802154_ATTR_LLSEC_SECLEVEL, params.out_level) || + nla_put_u32(msg, IEEE802154_ATTR_LLSEC_FRAME_COUNTER, + be32_to_cpu(params.frame_counter)) || +- ieee802154_llsec_fill_key_id(msg, ¶ms.out_key)) ++ ieee802154_llsec_fill_key_id(msg, ¶ms.out_key)) { ++ rc = -ENOBUFS; + goto out_free; ++ } + + dev_put(dev); + +-- +2.30.2 + diff --git a/queue-4.4/ipvs-ignore-ip_vs_svc_f_hashed-flag-when-adding-serv.patch b/queue-4.4/ipvs-ignore-ip_vs_svc_f_hashed-flag-when-adding-serv.patch new file mode 100644 index 00000000000..770a6616df3 --- /dev/null +++ b/queue-4.4/ipvs-ignore-ip_vs_svc_f_hashed-flag-when-adding-serv.patch @@ -0,0 +1,62 @@ +From 253d3b72ba24d3281caaeed2c34b907f4e349aa4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 May 2021 22:54:57 +0300 +Subject: ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service + +From: Julian Anastasov + +[ Upstream commit 56e4ee82e850026d71223262c07df7d6af3bd872 ] + +syzbot reported memory leak [1] when adding service with +HASHED flag. We should ignore this flag both from sockopt +and netlink provided data, otherwise the service is not +hashed and not visible while releasing resources. + +[1] +BUG: memory leak +unreferenced object 0xffff888115227800 (size 512): + comm "syz-executor263", pid 8658, jiffies 4294951882 (age 12.560s) + hex dump (first 32 bytes): + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + backtrace: + [] kmalloc include/linux/slab.h:556 [inline] + [] kzalloc include/linux/slab.h:686 [inline] + [] ip_vs_add_service+0x598/0x7c0 net/netfilter/ipvs/ip_vs_ctl.c:1343 + [] do_ip_vs_set_ctl+0x810/0xa40 net/netfilter/ipvs/ip_vs_ctl.c:2570 + [] nf_setsockopt+0x68/0xa0 net/netfilter/nf_sockopt.c:101 + [] ip_setsockopt+0x259/0x1ff0 net/ipv4/ip_sockglue.c:1435 + [] raw_setsockopt+0x18c/0x1b0 net/ipv4/raw.c:857 + [] __sys_setsockopt+0x1b0/0x360 net/socket.c:2117 + [] __do_sys_setsockopt net/socket.c:2128 [inline] + [] __se_sys_setsockopt net/socket.c:2125 [inline] + [] __x64_sys_setsockopt+0x22/0x30 net/socket.c:2125 + [] do_syscall_64+0x3a/0xb0 arch/x86/entry/common.c:47 + [] entry_SYSCALL_64_after_hwframe+0x44/0xae + +Reported-and-tested-by: syzbot+e562383183e4b1766930@syzkaller.appspotmail.com +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Julian Anastasov +Reviewed-by: Simon Horman +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c +index c7ee962a547b..1adbcdda2158 100644 +--- a/net/netfilter/ipvs/ip_vs_ctl.c ++++ b/net/netfilter/ipvs/ip_vs_ctl.c +@@ -1226,7 +1226,7 @@ ip_vs_add_service(struct netns_ipvs *ipvs, struct ip_vs_service_user_kern *u, + ip_vs_addr_copy(svc->af, &svc->addr, &u->addr); + svc->port = u->port; + svc->fwmark = u->fwmark; +- svc->flags = u->flags; ++ svc->flags = u->flags & ~IP_VS_SVC_F_HASHED; + svc->timeout = u->timeout * HZ; + svc->netmask = u->netmask; + svc->ipvs = ipvs; +-- +2.30.2 + diff --git a/queue-4.4/netfilter-nfnetlink_cthelper-hit-ebusy-on-updates-if.patch b/queue-4.4/netfilter-nfnetlink_cthelper-hit-ebusy-on-updates-if.patch new file mode 100644 index 00000000000..2323d46cc5f --- /dev/null +++ b/queue-4.4/netfilter-nfnetlink_cthelper-hit-ebusy-on-updates-if.patch @@ -0,0 +1,45 @@ +From 15fdf8b4c289e0a6f7b7e53a2f5476ad3d83b3d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 May 2021 13:45:16 +0200 +Subject: netfilter: nfnetlink_cthelper: hit EBUSY on updates if size + mismatches + +From: Pablo Neira Ayuso + +[ Upstream commit 8971ee8b087750a23f3cd4dc55bff2d0303fd267 ] + +The private helper data size cannot be updated. However, updates that +contain NFCTH_PRIV_DATA_LEN might bogusly hit EBUSY even if the size is +the same. + +Fixes: 12f7a505331e ("netfilter: add user-space connection tracking helper infrastructure") +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nfnetlink_cthelper.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c +index 8c1733869343..63a9d5fd00c0 100644 +--- a/net/netfilter/nfnetlink_cthelper.c ++++ b/net/netfilter/nfnetlink_cthelper.c +@@ -355,10 +355,14 @@ static int + nfnl_cthelper_update(const struct nlattr * const tb[], + struct nf_conntrack_helper *helper) + { ++ u32 size; + int ret; + +- if (tb[NFCTH_PRIV_DATA_LEN]) +- return -EBUSY; ++ if (tb[NFCTH_PRIV_DATA_LEN]) { ++ size = ntohl(nla_get_be32(tb[NFCTH_PRIV_DATA_LEN])); ++ if (size != helper->data_len) ++ return -EBUSY; ++ } + + if (tb[NFCTH_POLICY]) { + ret = nfnl_cthelper_update_policy(helper, tb[NFCTH_POLICY]); +-- +2.30.2 + diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..3510fce8860 --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1,8 @@ +efi-cper-fix-snprintf-use-in-cper_dimm_err_location.patch +vfio-pci-fix-error-return-code-in-vfio_ecap_init.patch +vfio-platform-fix-module_put-call-in-error-flow.patch +ipvs-ignore-ip_vs_svc_f_hashed-flag-when-adding-serv.patch +hid-pidff-fix-error-return-code-in-hid_pidff_init.patch +netfilter-nfnetlink_cthelper-hit-ebusy-on-updates-if.patch +ieee802154-fix-error-return-code-in-ieee802154_add_i.patch +ieee802154-fix-error-return-code-in-ieee802154_llsec.patch diff --git a/queue-4.4/vfio-pci-fix-error-return-code-in-vfio_ecap_init.patch b/queue-4.4/vfio-pci-fix-error-return-code-in-vfio_ecap_init.patch new file mode 100644 index 00000000000..45e9727fe42 --- /dev/null +++ b/queue-4.4/vfio-pci-fix-error-return-code-in-vfio_ecap_init.patch @@ -0,0 +1,39 @@ +From bcc0583001b2b8c15266039d89308109118702fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 15 May 2021 10:04:58 +0800 +Subject: vfio/pci: Fix error return code in vfio_ecap_init() + +From: Zhen Lei + +[ Upstream commit d1ce2c79156d3baf0830990ab06d296477b93c26 ] + +The error code returned from vfio_ext_cap_len() is stored in 'len', not +in 'ret'. + +Fixes: 89e1f7d4c66d ("vfio: Add PCI device driver") +Reported-by: Hulk Robot +Signed-off-by: Zhen Lei +Reviewed-by: Max Gurtovoy +Message-Id: <20210515020458.6771-1-thunder.leizhen@huawei.com> +Signed-off-by: Alex Williamson +Signed-off-by: Sasha Levin +--- + drivers/vfio/pci/vfio_pci_config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c +index 666b234acca0..9891001244ea 100644 +--- a/drivers/vfio/pci/vfio_pci_config.c ++++ b/drivers/vfio/pci/vfio_pci_config.c +@@ -1488,7 +1488,7 @@ static int vfio_ecap_init(struct vfio_pci_device *vdev) + if (len == 0xFF) { + len = vfio_ext_cap_len(vdev, ecap, epos); + if (len < 0) +- return ret; ++ return len; + } + } + +-- +2.30.2 + diff --git a/queue-4.4/vfio-platform-fix-module_put-call-in-error-flow.patch b/queue-4.4/vfio-platform-fix-module_put-call-in-error-flow.patch new file mode 100644 index 00000000000..0c81ce5779e --- /dev/null +++ b/queue-4.4/vfio-platform-fix-module_put-call-in-error-flow.patch @@ -0,0 +1,37 @@ +From 9d9d9f0c48e5718d04f6f8abf1d63e306588b841 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 May 2021 22:21:31 +0300 +Subject: vfio/platform: fix module_put call in error flow + +From: Max Gurtovoy + +[ Upstream commit dc51ff91cf2d1e9a2d941da483602f71d4a51472 ] + +The ->parent_module is the one that use in try_module_get. It should +also be the one the we use in module_put during vfio_platform_open(). + +Fixes: 32a2d71c4e80 ("vfio: platform: introduce vfio-platform-base module") +Signed-off-by: Max Gurtovoy +Message-Id: <20210518192133.59195-1-mgurtovoy@nvidia.com> +Signed-off-by: Alex Williamson +Signed-off-by: Sasha Levin +--- + drivers/vfio/platform/vfio_platform_common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c +index e65b142d3422..9b170ce16011 100644 +--- a/drivers/vfio/platform/vfio_platform_common.c ++++ b/drivers/vfio/platform/vfio_platform_common.c +@@ -192,7 +192,7 @@ err_irq: + vfio_platform_regions_cleanup(vdev); + err_reg: + mutex_unlock(&driver_lock); +- module_put(THIS_MODULE); ++ module_put(vdev->parent_module); + return ret; + } + +-- +2.30.2 +