From 527b0d2469c9ee207af2394657c31bd043b31cf0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 13 Aug 2022 17:21:18 +0200 Subject: [PATCH] 5.4-stable patches added patches: arm-dts-uniphier-fix-usb-interrupts-for-pxs2-soc.patch arm64-dts-uniphier-fix-usb-interrupts-for-pxs3-soc.patch coresight-clear-the-connection-field-properly.patch epoll-autoremove-wakers-even-more-aggressively.patch netfilter-nf_tables-do-not-allow-rule_id-to-refer-to-another-chain.patch netfilter-nf_tables-do-not-allow-set_id-to-refer-to-another-table.patch netfilter-nf_tables-fix-null-deref-due-to-zeroed-list-head.patch usb-gadget-fix-use-after-free-read-in-usb_udc_uevent.patch usb-hcd-fix-urb-giveback-issue-in-tasklet-function.patch --- ...hier-fix-usb-interrupts-for-pxs2-soc.patch | 46 +++++++ ...hier-fix-usb-interrupts-for-pxs3-soc.patch | 46 +++++++ ...-clear-the-connection-field-properly.patch | 118 +++++++++++++++++ ...remove-wakers-even-more-aggressively.patch | 90 +++++++++++++ ...ow-rule_id-to-refer-to-another-chain.patch | 73 +++++++++++ ...low-set_id-to-refer-to-another-table.patch | 57 ++++++++ ...x-null-deref-due-to-zeroed-list-head.patch | 45 +++++++ queue-5.4/series | 9 ++ ...se-after-free-read-in-usb_udc_uevent.patch | 72 ++++++++++ ...b-giveback-issue-in-tasklet-function.patch | 124 ++++++++++++++++++ 10 files changed, 680 insertions(+) create mode 100644 queue-5.4/arm-dts-uniphier-fix-usb-interrupts-for-pxs2-soc.patch create mode 100644 queue-5.4/arm64-dts-uniphier-fix-usb-interrupts-for-pxs3-soc.patch create mode 100644 queue-5.4/coresight-clear-the-connection-field-properly.patch create mode 100644 queue-5.4/epoll-autoremove-wakers-even-more-aggressively.patch create mode 100644 queue-5.4/netfilter-nf_tables-do-not-allow-rule_id-to-refer-to-another-chain.patch create mode 100644 queue-5.4/netfilter-nf_tables-do-not-allow-set_id-to-refer-to-another-table.patch create mode 100644 queue-5.4/netfilter-nf_tables-fix-null-deref-due-to-zeroed-list-head.patch create mode 100644 queue-5.4/usb-gadget-fix-use-after-free-read-in-usb_udc_uevent.patch create mode 100644 queue-5.4/usb-hcd-fix-urb-giveback-issue-in-tasklet-function.patch diff --git a/queue-5.4/arm-dts-uniphier-fix-usb-interrupts-for-pxs2-soc.patch b/queue-5.4/arm-dts-uniphier-fix-usb-interrupts-for-pxs2-soc.patch new file mode 100644 index 00000000000..08dc316ec09 --- /dev/null +++ b/queue-5.4/arm-dts-uniphier-fix-usb-interrupts-for-pxs2-soc.patch @@ -0,0 +1,46 @@ +From 9b0dc7abb5cc43a2dbf90690c3c6011dcadc574d Mon Sep 17 00:00:00 2001 +From: Kunihiko Hayashi +Date: Tue, 2 Aug 2022 22:36:25 +0900 +Subject: ARM: dts: uniphier: Fix USB interrupts for PXs2 SoC + +From: Kunihiko Hayashi + +commit 9b0dc7abb5cc43a2dbf90690c3c6011dcadc574d upstream. + +An interrupt for USB device are shared with USB host. Set interrupt-names +property to common "dwc_usb3" instead of "host" and "peripheral". + +Cc: stable@vger.kernel.org +Fixes: 45be1573ad19 ("ARM: dts: uniphier: Add USB3 controller nodes") +Reported-by: Ryuta NAKANISHI +Signed-off-by: Kunihiko Hayashi +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi ++++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi +@@ -585,8 +585,8 @@ + compatible = "socionext,uniphier-dwc3", "snps,dwc3"; + status = "disabled"; + reg = <0x65a00000 0xcd00>; +- interrupt-names = "host", "peripheral"; +- interrupts = <0 134 4>, <0 135 4>; ++ interrupt-names = "dwc_usb3"; ++ interrupts = <0 134 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>; + clock-names = "ref", "bus_early", "suspend"; +@@ -681,8 +681,8 @@ + compatible = "socionext,uniphier-dwc3", "snps,dwc3"; + status = "disabled"; + reg = <0x65c00000 0xcd00>; +- interrupt-names = "host", "peripheral"; +- interrupts = <0 137 4>, <0 138 4>; ++ interrupt-names = "dwc_usb3"; ++ interrupts = <0 137 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>; + clock-names = "ref", "bus_early", "suspend"; diff --git a/queue-5.4/arm64-dts-uniphier-fix-usb-interrupts-for-pxs3-soc.patch b/queue-5.4/arm64-dts-uniphier-fix-usb-interrupts-for-pxs3-soc.patch new file mode 100644 index 00000000000..5ef3b32dd5e --- /dev/null +++ b/queue-5.4/arm64-dts-uniphier-fix-usb-interrupts-for-pxs3-soc.patch @@ -0,0 +1,46 @@ +From fe17b91a7777df140d0f1433991da67ba658796c Mon Sep 17 00:00:00 2001 +From: Kunihiko Hayashi +Date: Tue, 2 Aug 2022 22:36:47 +0900 +Subject: arm64: dts: uniphier: Fix USB interrupts for PXs3 SoC + +From: Kunihiko Hayashi + +commit fe17b91a7777df140d0f1433991da67ba658796c upstream. + +An interrupt for USB device are shared with USB host. Set interrupt-names +property to common "dwc_usb3" instead of "host" and "peripheral". + +Cc: stable@vger.kernel.org +Fixes: d7b9beb830d7 ("arm64: dts: uniphier: Add USB3 controller nodes") +Reported-by: Ryuta NAKANISHI +Signed-off-by: Kunihiko Hayashi +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi ++++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi +@@ -544,8 +544,8 @@ + compatible = "socionext,uniphier-dwc3", "snps,dwc3"; + status = "disabled"; + reg = <0x65a00000 0xcd00>; +- interrupt-names = "host", "peripheral"; +- interrupts = <0 134 4>, <0 135 4>; ++ interrupt-names = "dwc_usb3"; ++ interrupts = <0 134 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>; + clock-names = "ref", "bus_early", "suspend"; +@@ -646,8 +646,8 @@ + compatible = "socionext,uniphier-dwc3", "snps,dwc3"; + status = "disabled"; + reg = <0x65c00000 0xcd00>; +- interrupt-names = "host", "peripheral"; +- interrupts = <0 137 4>, <0 138 4>; ++ interrupt-names = "dwc_usb3"; ++ interrupts = <0 137 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>; + clock-names = "ref", "bus_early", "suspend"; diff --git a/queue-5.4/coresight-clear-the-connection-field-properly.patch b/queue-5.4/coresight-clear-the-connection-field-properly.patch new file mode 100644 index 00000000000..ad0a5384193 --- /dev/null +++ b/queue-5.4/coresight-clear-the-connection-field-properly.patch @@ -0,0 +1,118 @@ +From 2af89ebacf299b7fba5f3087d35e8a286ec33706 Mon Sep 17 00:00:00 2001 +From: Suzuki K Poulose +Date: Tue, 14 Jun 2022 22:40:24 +0100 +Subject: coresight: Clear the connection field properly + +From: Suzuki K Poulose + +commit 2af89ebacf299b7fba5f3087d35e8a286ec33706 upstream. + +coresight devices track their connections (output connections) and +hold a reference to the fwnode. When a device goes away, we walk through +the devices on the coresight bus and make sure that the references +are dropped. This happens both ways: + a) For all output connections from the device, drop the reference to + the target device via coresight_release_platform_data() + +b) Iterate over all the devices on the coresight bus and drop the + reference to fwnode if *this* device is the target of the output + connection, via coresight_remove_conns()->coresight_remove_match(). + +However, the coresight_remove_match() doesn't clear the fwnode field, +after dropping the reference, this causes use-after-free and +additional refcount drops on the fwnode. + +e.g., if we have two devices, A and B, with a connection, A -> B. +If we remove B first, B would clear the reference on B, from A +via coresight_remove_match(). But when A is removed, it still has +a connection with fwnode still pointing to B. Thus it tries to drops +the reference in coresight_release_platform_data(), raising the bells +like : + +[ 91.990153] ------------[ cut here ]------------ +[ 91.990163] refcount_t: addition on 0; use-after-free. +[ 91.990212] WARNING: CPU: 0 PID: 461 at lib/refcount.c:25 refcount_warn_saturate+0xa0/0x144 +[ 91.990260] Modules linked in: coresight_funnel coresight_replicator coresight_etm4x(-) + crct10dif_ce coresight ip_tables x_tables ipv6 [last unloaded: coresight_cpu_debug] +[ 91.990398] CPU: 0 PID: 461 Comm: rmmod Tainted: G W T 5.19.0-rc2+ #53 +[ 91.990418] Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform, BIOS EDK II Feb 1 2019 +[ 91.990434] pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +[ 91.990454] pc : refcount_warn_saturate+0xa0/0x144 +[ 91.990476] lr : refcount_warn_saturate+0xa0/0x144 +[ 91.990496] sp : ffff80000c843640 +[ 91.990509] x29: ffff80000c843640 x28: ffff800009957c28 x27: ffff80000c8439a8 +[ 91.990560] x26: ffff00097eff1990 x25: ffff8000092b6ad8 x24: ffff00097eff19a8 +[ 91.990610] x23: ffff80000c8439a8 x22: 0000000000000000 x21: ffff80000c8439c2 +[ 91.990659] x20: 0000000000000000 x19: ffff00097eff1a10 x18: ffff80000ab99c40 +[ 91.990708] x17: 0000000000000000 x16: 0000000000000000 x15: ffff80000abf6fa0 +[ 91.990756] x14: 000000000000001d x13: 0a2e656572662d72 x12: 657466612d657375 +[ 91.990805] x11: 203b30206e6f206e x10: 6f69746964646120 x9 : ffff8000081aba28 +[ 91.990854] x8 : 206e6f206e6f6974 x7 : 69646461203a745f x6 : 746e756f63666572 +[ 91.990903] x5 : ffff00097648ec58 x4 : 0000000000000000 x3 : 0000000000000027 +[ 91.990952] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff00080260ba00 +[ 91.991000] Call trace: +[ 91.991012] refcount_warn_saturate+0xa0/0x144 +[ 91.991034] kobject_get+0xac/0xb0 +[ 91.991055] of_node_get+0x2c/0x40 +[ 91.991076] of_fwnode_get+0x40/0x60 +[ 91.991094] fwnode_handle_get+0x3c/0x60 +[ 91.991116] fwnode_get_nth_parent+0xf4/0x110 +[ 91.991137] fwnode_full_name_string+0x48/0xc0 +[ 91.991158] device_node_string+0x41c/0x530 +[ 91.991178] pointer+0x320/0x3ec +[ 91.991198] vsnprintf+0x23c/0x750 +[ 91.991217] vprintk_store+0x104/0x4b0 +[ 91.991238] vprintk_emit+0x8c/0x360 +[ 91.991257] vprintk_default+0x44/0x50 +[ 91.991276] vprintk+0xcc/0xf0 +[ 91.991295] _printk+0x68/0x90 +[ 91.991315] of_node_release+0x13c/0x14c +[ 91.991334] kobject_put+0x98/0x114 +[ 91.991354] of_node_put+0x24/0x34 +[ 91.991372] of_fwnode_put+0x40/0x5c +[ 91.991390] fwnode_handle_put+0x38/0x50 +[ 91.991411] coresight_release_platform_data+0x74/0xb0 [coresight] +[ 91.991472] coresight_unregister+0x64/0xcc [coresight] +[ 91.991525] etm4_remove_dev+0x64/0x78 [coresight_etm4x] +[ 91.991563] etm4_remove_amba+0x1c/0x2c [coresight_etm4x] +[ 91.991598] amba_remove+0x3c/0x19c + +Reproducible by: (Build all coresight components as modules): + + #!/bin/sh + while true + do + for m in tmc stm cpu_debug etm4x replicator funnel + do + modprobe coresight_${m} + done + + for m in tmc stm cpu_debug etm4x replicator funnel + do + rmmode coresight_${m} + done + done + +Cc: stable@vger.kernel.org +Cc: Mathieu Poirier +Cc: Mike Leach +Cc: Leo Yan +Signed-off-by: Suzuki K Poulose +Fixes: 37ea1ffddffa ("coresight: Use fwnode handle instead of device names") +Link: https://lore.kernel.org/r/20220614214024.3005275-1-suzuki.poulose@arm.com +Signed-off-by: Mathieu Poirier +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hwtracing/coresight/coresight.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/hwtracing/coresight/coresight.c ++++ b/drivers/hwtracing/coresight/coresight.c +@@ -1073,6 +1073,7 @@ static int coresight_remove_match(struct + * platform data. + */ + fwnode_handle_put(conn->child_fwnode); ++ conn->child_fwnode = NULL; + /* No need to continue */ + break; + } diff --git a/queue-5.4/epoll-autoremove-wakers-even-more-aggressively.patch b/queue-5.4/epoll-autoremove-wakers-even-more-aggressively.patch new file mode 100644 index 00000000000..06148225b7a --- /dev/null +++ b/queue-5.4/epoll-autoremove-wakers-even-more-aggressively.patch @@ -0,0 +1,90 @@ +From a16ceb13961068f7209e34d7984f8e42d2c06159 Mon Sep 17 00:00:00 2001 +From: Benjamin Segall +Date: Wed, 15 Jun 2022 14:24:23 -0700 +Subject: epoll: autoremove wakers even more aggressively + +From: Benjamin Segall + +commit a16ceb13961068f7209e34d7984f8e42d2c06159 upstream. + +If a process is killed or otherwise exits while having active network +connections and many threads waiting on epoll_wait, the threads will all +be woken immediately, but not removed from ep->wq. Then when network +traffic scans ep->wq in wake_up, every wakeup attempt will fail, and will +not remove the entries from the list. + +This means that the cost of the wakeup attempt is far higher than usual, +does not decrease, and this also competes with the dying threads trying to +actually make progress and remove themselves from the wq. + +Handle this by removing visited epoll wq entries unconditionally, rather +than only when the wakeup succeeds - the structure of ep_poll means that +the only potential loss is the timed_out->eavail heuristic, which now can +race and result in a redundant ep_send_events attempt. (But only when +incoming data and a timeout actually race, not on every timeout) + +Shakeel added: + +: We are seeing this issue in production with real workloads and it has +: caused hard lockups. Particularly network heavy workloads with a lot +: of threads in epoll_wait() can easily trigger this issue if they get +: killed (oom-killed in our case). + +Link: https://lkml.kernel.org/r/xm26fsjotqda.fsf@google.com +Signed-off-by: Ben Segall +Tested-by: Shakeel Butt +Cc: Alexander Viro +Cc: Linus Torvalds +Cc: Shakeel Butt +Cc: Eric Dumazet +Cc: Roman Penyaev +Cc: Jason Baron +Cc: Khazhismel Kumykov +Cc: Heiher +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/eventpoll.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +--- a/fs/eventpoll.c ++++ b/fs/eventpoll.c +@@ -1803,6 +1803,21 @@ static inline struct timespec64 ep_set_m + return timespec64_add_safe(now, ts); + } + ++/* ++ * autoremove_wake_function, but remove even on failure to wake up, because we ++ * know that default_wake_function/ttwu will only fail if the thread is already ++ * woken, and in that case the ep_poll loop will remove the entry anyways, not ++ * try to reuse it. ++ */ ++static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry, ++ unsigned int mode, int sync, void *key) ++{ ++ int ret = default_wake_function(wq_entry, mode, sync, key); ++ ++ list_del_init(&wq_entry->entry); ++ return ret; ++} ++ + /** + * ep_poll - Retrieves ready events, and delivers them to the caller supplied + * event buffer. +@@ -1880,8 +1895,15 @@ fetch_events: + * normal wakeup path no need to call __remove_wait_queue() + * explicitly, thus ep->lock is not taken, which halts the + * event delivery. ++ * ++ * In fact, we now use an even more aggressive function that ++ * unconditionally removes, because we don't reuse the wait ++ * entry between loop iterations. This lets us also avoid the ++ * performance issue if a process is killed, causing all of its ++ * threads to wake up without being removed normally. + */ + init_wait(&wait); ++ wait.func = ep_autoremove_wake_function; + write_lock_irq(&ep->lock); + __add_wait_queue_exclusive(&ep->wq, &wait); + write_unlock_irq(&ep->lock); diff --git a/queue-5.4/netfilter-nf_tables-do-not-allow-rule_id-to-refer-to-another-chain.patch b/queue-5.4/netfilter-nf_tables-do-not-allow-rule_id-to-refer-to-another-chain.patch new file mode 100644 index 00000000000..982f355f759 --- /dev/null +++ b/queue-5.4/netfilter-nf_tables-do-not-allow-rule_id-to-refer-to-another-chain.patch @@ -0,0 +1,73 @@ +From 36d5b2913219ac853908b0f1c664345e04313856 Mon Sep 17 00:00:00 2001 +From: Thadeu Lima de Souza Cascardo +Date: Tue, 9 Aug 2022 14:01:48 -0300 +Subject: netfilter: nf_tables: do not allow RULE_ID to refer to another chain + +From: Thadeu Lima de Souza Cascardo + +commit 36d5b2913219ac853908b0f1c664345e04313856 upstream. + +When doing lookups for rules on the same batch by using its ID, a rule from +a different chain can be used. If a rule is added to a chain but tries to +be positioned next to a rule from a different chain, it will be linked to +chain2, but the use counter on chain1 would be the one to be incremented. + +When looking for rules by ID, use the chain that was used for the lookup by +name. The chain used in the context copied to the transaction needs to +match that same chain. That way, struct nft_rule does not need to get +enlarged with another member. + +Fixes: 1a94e38d254b ("netfilter: nf_tables: add NFTA_RULE_ID attribute") +Fixes: 75dd48e2e420 ("netfilter: nf_tables: Support RULE_ID reference in new rule") +Signed-off-by: Thadeu Lima de Souza Cascardo +Cc: +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman +--- + net/netfilter/nf_tables_api.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -2713,6 +2713,7 @@ static int nft_table_validate(struct net + } + + static struct nft_rule *nft_rule_lookup_byid(const struct net *net, ++ const struct nft_chain *chain, + const struct nlattr *nla); + + #define NFT_RULE_MAXEXPRS 128 +@@ -2786,7 +2787,7 @@ static int nf_tables_newrule(struct net + return PTR_ERR(old_rule); + } + } else if (nla[NFTA_RULE_POSITION_ID]) { +- old_rule = nft_rule_lookup_byid(net, nla[NFTA_RULE_POSITION_ID]); ++ old_rule = nft_rule_lookup_byid(net, chain, nla[NFTA_RULE_POSITION_ID]); + if (IS_ERR(old_rule)) { + NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_POSITION_ID]); + return PTR_ERR(old_rule); +@@ -2921,6 +2922,7 @@ err1: + } + + static struct nft_rule *nft_rule_lookup_byid(const struct net *net, ++ const struct nft_chain *chain, + const struct nlattr *nla) + { + u32 id = ntohl(nla_get_be32(nla)); +@@ -2930,6 +2932,7 @@ static struct nft_rule *nft_rule_lookup_ + struct nft_rule *rule = nft_trans_rule(trans); + + if (trans->msg_type == NFT_MSG_NEWRULE && ++ trans->ctx.chain == chain && + id == nft_trans_rule_id(trans)) + return rule; + } +@@ -2976,7 +2979,7 @@ static int nf_tables_delrule(struct net + + err = nft_delrule(&ctx, rule); + } else if (nla[NFTA_RULE_ID]) { +- rule = nft_rule_lookup_byid(net, nla[NFTA_RULE_ID]); ++ rule = nft_rule_lookup_byid(net, chain, nla[NFTA_RULE_ID]); + if (IS_ERR(rule)) { + NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_ID]); + return PTR_ERR(rule); diff --git a/queue-5.4/netfilter-nf_tables-do-not-allow-set_id-to-refer-to-another-table.patch b/queue-5.4/netfilter-nf_tables-do-not-allow-set_id-to-refer-to-another-table.patch new file mode 100644 index 00000000000..1e3b0a19aad --- /dev/null +++ b/queue-5.4/netfilter-nf_tables-do-not-allow-set_id-to-refer-to-another-table.patch @@ -0,0 +1,57 @@ +From 470ee20e069a6d05ae549f7d0ef2bdbcee6a81b2 Mon Sep 17 00:00:00 2001 +From: Thadeu Lima de Souza Cascardo +Date: Tue, 9 Aug 2022 14:01:46 -0300 +Subject: netfilter: nf_tables: do not allow SET_ID to refer to another table + +From: Thadeu Lima de Souza Cascardo + +commit 470ee20e069a6d05ae549f7d0ef2bdbcee6a81b2 upstream. + +When doing lookups for sets on the same batch by using its ID, a set from a +different table can be used. + +Then, when the table is removed, a reference to the set may be kept after +the set is freed, leading to a potential use-after-free. + +When looking for sets by ID, use the table that was used for the lookup by +name, and only return sets belonging to that same table. + +This fixes CVE-2022-2586, also reported as ZDI-CAN-17470. + +Reported-by: Team Orca of Sea Security (@seasecresponse) +Fixes: 958bee14d071 ("netfilter: nf_tables: use new transaction infrastructure to handle sets") +Signed-off-by: Thadeu Lima de Souza Cascardo +Cc: +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman +--- + net/netfilter/nf_tables_api.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -3191,6 +3191,7 @@ static struct nft_set *nft_set_lookup_by + } + + static struct nft_set *nft_set_lookup_byid(const struct net *net, ++ const struct nft_table *table, + const struct nlattr *nla, u8 genmask) + { + struct nft_trans *trans; +@@ -3201,6 +3202,7 @@ static struct nft_set *nft_set_lookup_by + struct nft_set *set = nft_trans_set(trans); + + if (id == nft_trans_set_id(trans) && ++ set->table == table && + nft_active_genmask(set, genmask)) + return set; + } +@@ -3221,7 +3223,7 @@ struct nft_set *nft_set_lookup_global(co + if (!nla_set_id) + return set; + +- set = nft_set_lookup_byid(net, nla_set_id, genmask); ++ set = nft_set_lookup_byid(net, table, nla_set_id, genmask); + } + return set; + } diff --git a/queue-5.4/netfilter-nf_tables-fix-null-deref-due-to-zeroed-list-head.patch b/queue-5.4/netfilter-nf_tables-fix-null-deref-due-to-zeroed-list-head.patch new file mode 100644 index 00000000000..b5398ac8b65 --- /dev/null +++ b/queue-5.4/netfilter-nf_tables-fix-null-deref-due-to-zeroed-list-head.patch @@ -0,0 +1,45 @@ +From 580077855a40741cf511766129702d97ff02f4d9 Mon Sep 17 00:00:00 2001 +From: Florian Westphal +Date: Tue, 9 Aug 2022 18:34:02 +0200 +Subject: netfilter: nf_tables: fix null deref due to zeroed list head + +From: Florian Westphal + +commit 580077855a40741cf511766129702d97ff02f4d9 upstream. + +In nf_tables_updtable, if nf_tables_table_enable returns an error, +nft_trans_destroy is called to free the transaction object. + +nft_trans_destroy() calls list_del(), but the transaction was never +placed on a list -- the list head is all zeroes, this results in +a null dereference: + +BUG: KASAN: null-ptr-deref in nft_trans_destroy+0x26/0x59 +Call Trace: + nft_trans_destroy+0x26/0x59 + nf_tables_newtable+0x4bc/0x9bc + [..] + +Its sane to assume that nft_trans_destroy() can be called +on the transaction object returned by nft_trans_alloc(), so +make sure the list head is initialised. + +Fixes: 55dd6f93076b ("netfilter: nf_tables: use new transaction infrastructure to handle table") +Reported-by: mingi cho +Signed-off-by: Florian Westphal +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Greg Kroah-Hartman +--- + net/netfilter/nf_tables_api.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -113,6 +113,7 @@ static struct nft_trans *nft_trans_alloc + if (trans == NULL) + return NULL; + ++ INIT_LIST_HEAD(&trans->list); + trans->msg_type = msg_type; + trans->ctx = *ctx; + diff --git a/queue-5.4/series b/queue-5.4/series index 9881e04595b..eb8fa41c962 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -42,3 +42,12 @@ powerpc-fsl-pci-fix-class-code-of-pcie-root-port.patch powerpc-ptdump-fix-display-of-rw-pages-on-fsl_book3e.patch powerpc-powernv-avoid-crashing-if-rng-is-null.patch mips-cpuinfo-fix-a-warning-for-config_cpumask_offstack.patch +coresight-clear-the-connection-field-properly.patch +usb-hcd-fix-urb-giveback-issue-in-tasklet-function.patch +arm-dts-uniphier-fix-usb-interrupts-for-pxs2-soc.patch +arm64-dts-uniphier-fix-usb-interrupts-for-pxs3-soc.patch +usb-gadget-fix-use-after-free-read-in-usb_udc_uevent.patch +netfilter-nf_tables-do-not-allow-set_id-to-refer-to-another-table.patch +netfilter-nf_tables-do-not-allow-rule_id-to-refer-to-another-chain.patch +netfilter-nf_tables-fix-null-deref-due-to-zeroed-list-head.patch +epoll-autoremove-wakers-even-more-aggressively.patch diff --git a/queue-5.4/usb-gadget-fix-use-after-free-read-in-usb_udc_uevent.patch b/queue-5.4/usb-gadget-fix-use-after-free-read-in-usb_udc_uevent.patch new file mode 100644 index 00000000000..11d1d378c41 --- /dev/null +++ b/queue-5.4/usb-gadget-fix-use-after-free-read-in-usb_udc_uevent.patch @@ -0,0 +1,72 @@ +From 2191c00855b03aa59c20e698be713d952d51fc18 Mon Sep 17 00:00:00 2001 +From: Alan Stern +Date: Thu, 21 Jul 2022 11:07:10 -0400 +Subject: USB: gadget: Fix use-after-free Read in usb_udc_uevent() + +From: Alan Stern + +commit 2191c00855b03aa59c20e698be713d952d51fc18 upstream. + +The syzbot fuzzer found a race between uevent callbacks and gadget +driver unregistration that can cause a use-after-free bug: + +--------------------------------------------------------------- +BUG: KASAN: use-after-free in usb_udc_uevent+0x11f/0x130 +drivers/usb/gadget/udc/core.c:1732 +Read of size 8 at addr ffff888078ce2050 by task udevd/2968 + +CPU: 1 PID: 2968 Comm: udevd Not tainted 5.19.0-rc4-next-20220628-syzkaller #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google +06/29/2022 +Call Trace: + + __dump_stack lib/dump_stack.c:88 [inline] + dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 + print_address_description mm/kasan/report.c:317 [inline] + print_report.cold+0x2ba/0x719 mm/kasan/report.c:433 + kasan_report+0xbe/0x1f0 mm/kasan/report.c:495 + usb_udc_uevent+0x11f/0x130 drivers/usb/gadget/udc/core.c:1732 + dev_uevent+0x290/0x770 drivers/base/core.c:2424 +--------------------------------------------------------------- + +The bug occurs because usb_udc_uevent() dereferences udc->driver but +does so without acquiring the udc_lock mutex, which protects this +field. If the gadget driver is unbound from the udc concurrently with +uevent processing, the driver structure may be accessed after it has +been deallocated. + +To prevent the race, we make sure that the routine holds the mutex +around the racing accesses. + +Link: +CC: stable@vger.kernel.org # fc274c1e9973 +Reported-and-tested-by: syzbot+b0de012ceb1e2a97891b@syzkaller.appspotmail.com +Signed-off-by: Alan Stern +Link: https://lore.kernel.org/r/YtlrnhHyrHsSky9m@rowland.harvard.edu +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/gadget/udc/core.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +--- a/drivers/usb/gadget/udc/core.c ++++ b/drivers/usb/gadget/udc/core.c +@@ -1592,13 +1592,14 @@ static int usb_udc_uevent(struct device + return ret; + } + +- if (udc->driver) { ++ mutex_lock(&udc_lock); ++ if (udc->driver) + ret = add_uevent_var(env, "USB_UDC_DRIVER=%s", + udc->driver->function); +- if (ret) { +- dev_err(dev, "failed to add uevent USB_UDC_DRIVER\n"); +- return ret; +- } ++ mutex_unlock(&udc_lock); ++ if (ret) { ++ dev_err(dev, "failed to add uevent USB_UDC_DRIVER\n"); ++ return ret; + } + + return 0; diff --git a/queue-5.4/usb-hcd-fix-urb-giveback-issue-in-tasklet-function.patch b/queue-5.4/usb-hcd-fix-urb-giveback-issue-in-tasklet-function.patch new file mode 100644 index 00000000000..f49c333f6ec --- /dev/null +++ b/queue-5.4/usb-hcd-fix-urb-giveback-issue-in-tasklet-function.patch @@ -0,0 +1,124 @@ +From 26c6c2f8a907c9e3a2f24990552a4d77235791e6 Mon Sep 17 00:00:00 2001 +From: Weitao Wang +Date: Tue, 26 Jul 2022 15:49:18 +0800 +Subject: USB: HCD: Fix URB giveback issue in tasklet function + +From: Weitao Wang + +commit 26c6c2f8a907c9e3a2f24990552a4d77235791e6 upstream. + +Usb core introduce the mechanism of giveback of URB in tasklet context to +reduce hardware interrupt handling time. On some test situation(such as +FIO with 4KB block size), when tasklet callback function called to +giveback URB, interrupt handler add URB node to the bh->head list also. +If check bh->head list again after finish all URB giveback of local_list, +then it may introduce a "dynamic balance" between giveback URB and add URB +to bh->head list. This tasklet callback function may not exit for a long +time, which will cause other tasklet function calls to be delayed. Some +real-time applications(such as KB and Mouse) will see noticeable lag. + +In order to prevent the tasklet function from occupying the cpu for a long +time at a time, new URBS will not be added to the local_list even though +the bh->head list is not empty. But also need to ensure the left URB +giveback to be processed in time, so add a member high_prio for structure +giveback_urb_bh to prioritize tasklet and schelule this tasklet again if +bh->head list is not empty. + +At the same time, we are able to prioritize tasklet through structure +member high_prio. So, replace the local high_prio_bh variable with this +structure member in usb_hcd_giveback_urb. + +Fixes: 94dfd7edfd5c ("USB: HCD: support giveback of URB in tasklet context") +Cc: stable +Reviewed-by: Alan Stern +Signed-off-by: Weitao Wang +Link: https://lore.kernel.org/r/20220726074918.5114-1-WeitaoWang-oc@zhaoxin.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/core/hcd.c | 26 +++++++++++++++----------- + include/linux/usb/hcd.h | 1 + + 2 files changed, 16 insertions(+), 11 deletions(-) + +--- a/drivers/usb/core/hcd.c ++++ b/drivers/usb/core/hcd.c +@@ -1688,7 +1688,6 @@ static void usb_giveback_urb_bh(unsigned + + spin_lock_irq(&bh->lock); + bh->running = true; +- restart: + list_replace_init(&bh->head, &local_list); + spin_unlock_irq(&bh->lock); + +@@ -1702,10 +1701,17 @@ static void usb_giveback_urb_bh(unsigned + bh->completing_ep = NULL; + } + +- /* check if there are new URBs to giveback */ ++ /* ++ * giveback new URBs next time to prevent this function ++ * from not exiting for a long time. ++ */ + spin_lock_irq(&bh->lock); +- if (!list_empty(&bh->head)) +- goto restart; ++ if (!list_empty(&bh->head)) { ++ if (bh->high_prio) ++ tasklet_hi_schedule(&bh->bh); ++ else ++ tasklet_schedule(&bh->bh); ++ } + bh->running = false; + spin_unlock_irq(&bh->lock); + } +@@ -1730,7 +1736,7 @@ static void usb_giveback_urb_bh(unsigned + void usb_hcd_giveback_urb(struct usb_hcd *hcd, struct urb *urb, int status) + { + struct giveback_urb_bh *bh; +- bool running, high_prio_bh; ++ bool running; + + /* pass status to tasklet via unlinked */ + if (likely(!urb->unlinked)) +@@ -1741,13 +1747,10 @@ void usb_hcd_giveback_urb(struct usb_hcd + return; + } + +- if (usb_pipeisoc(urb->pipe) || usb_pipeint(urb->pipe)) { ++ if (usb_pipeisoc(urb->pipe) || usb_pipeint(urb->pipe)) + bh = &hcd->high_prio_bh; +- high_prio_bh = true; +- } else { ++ else + bh = &hcd->low_prio_bh; +- high_prio_bh = false; +- } + + spin_lock(&bh->lock); + list_add_tail(&urb->urb_list, &bh->head); +@@ -1756,7 +1759,7 @@ void usb_hcd_giveback_urb(struct usb_hcd + + if (running) + ; +- else if (high_prio_bh) ++ else if (bh->high_prio) + tasklet_hi_schedule(&bh->bh); + else + tasklet_schedule(&bh->bh); +@@ -2796,6 +2799,7 @@ int usb_add_hcd(struct usb_hcd *hcd, + + /* initialize tasklets */ + init_giveback_urb_bh(&hcd->high_prio_bh); ++ hcd->high_prio_bh.high_prio = true; + init_giveback_urb_bh(&hcd->low_prio_bh); + + /* enable irqs just before we start the controller, +--- a/include/linux/usb/hcd.h ++++ b/include/linux/usb/hcd.h +@@ -66,6 +66,7 @@ + + struct giveback_urb_bh { + bool running; ++ bool high_prio; + spinlock_t lock; + struct list_head head; + struct tasklet_struct bh; -- 2.47.3