From cf2b0cb1c02d8380cb78cf2c80999877d7cdfe6c Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 8 Sep 2024 09:22:04 -0400 Subject: [PATCH] Fixes for 5.10 Signed-off-by: Sasha Levin --- ...ve-put_pid-put_cred-in-copy_peercred.patch | 58 ++++ ...ut-value-sanity-checks-to-hdmi-chann.patch | 61 ++++ ...-properly-initialize-soc_enum-values.patch | 38 +++ ...a-pata_macio-use-warn-instead-of-bug.patch | 53 ++++ .../bareudp-fix-device-stats-updates.patch | 106 +++++++ ...ur-handling-of-refs-0-in-snapshot-de.patch | 90 ++++++ ...-location-to-fix-wmaybe-uninitialize.patch | 56 ++++ ...bug_on-with-assert-in-walk_down_proc.patch | 46 +++ ...-proc-entry-when-dev-is-unregistered.patch | 99 ++++++ ...-css-cgroup-write-under-css_set_lock.patch | 45 +++ ...alize-an-uninitialized-struct-member.patch | 35 +++ ...m-init-handle-minors-larger-than-255.patch | 43 +++ ...ivers-net-usb-remove-all-strcpy-uses.patch | 68 ++++ .../fou-fix-null-ptr-deref-in-gro.patch | 172 ++++++++++ queue-5.10/fou-remove-sparse-errors.patch | 116 +++++++ ...ead_lock-rcu_read_unlock-from-gro_co.patch | 222 +++++++++++++ ...ead_lock-rcu_read_unlock-from-gro_re.patch | 296 ++++++++++++++++++ ...lab-out-of-bounds-read-in-cougar_rep.patch | 38 +++ ...-fix-underflows-seen-when-writing-li.patch | 44 +++ ...x-underflows-seen-when-writing-limit.patch | 63 ++++ ...re-fix-underflows-seen-when-writing-.patch | 36 +++ ...fix-underflows-seen-when-writing-lim.patch | 44 +++ ...earing-timesync-interrupts-for-82580.patch | 70 +++++ ...igc-unlock-on-error-in-igc_io_resume.patch | 35 +++ ...ect-requests-with-unreasonable-numbe.patch | 59 ++++ .../iommu-sun50i-clear-bypass-register.patch | 43 +++ ...ndle-volatile-descriptor-status-read.patch | 56 ++++ ...70-xp-do-not-allow-mapping-irq-0-and.patch | 46 +++ ...lways-configure-affinity-on-vpe-acti.patch | 83 +++++ ...f-heaps-ensure-the-driver-name-is-nu.patch | 55 ++++ ...-byte-call-of_node_put-on-error-path.patch | 61 ++++ ...x-tree.c-fix-rare-race-in-__genradix.patch | 39 +++ ...checks-to-bpf_object__-prev_map-next.patch | 59 ++++ ...-add-check-for-v4l2_fwnode_endpoint_.patch | 39 +++ ...t-set-hdmi-tx-controls-if-there-are-.patch | 56 ++++ ...fix-wrong-sizeimage-value-for-mplane.patch | 87 +++++ ...n-t-call-get_c0_compare_int-if-timer.patch | 78 +++++ ...b_external_learn_add-always-set-ext_.patch | 58 ++++ ...-on-stack-arrays-of-nr_cpus-elements.patch | 132 ++++++++ ...fix-possible-subblocks-range-of-capt.patch | 62 ++++ ...-t-write-directly-to-netdev-dev_addr.patch | 236 ++++++++++++++ ...nf_conncount-fix-wrong-variable-type.patch | 70 +++++ ...g-rescheduling-points-in-nfs_client_.patch | 44 +++ ...evice-address-out-of-bounds-read-in-.patch | 131 ++++++++ ...-missing-bridge-lock-to-pci_bus_lock.patch | 163 ++++++++++ ...php-fix-hotplug-driver-crash-on-powe.patch | 58 ++++ ...-workaround-for-errata-i2037-am65x-s.patch | 129 ++++++++ ...rce_size-function-on-resource-object.patch | 46 +++ ...l-smbios-fix-error-path-in-dell_smbi.patch | 54 ++++ ....s-move-ro_after_init-section-behind.patch | 75 +++++ queue-5.10/series | 62 ++++ ...x-sockets-fix-accept-ed-socket-label.patch | 60 ++++ ...destroy_work_on_stack-call-in-smp_ca.patch | 45 +++ ...shfs-sanity-check-symbolic-link-size.patch | 68 ++++ ...ch-another-reply-chunk-overflow-case.patch | 36 +++ ...return-value-of-tcp_bpf_sendmsg.patch-1053 | 96 ++++++ ...df-avoid-excessive-partition-lengths.patch | 63 ++++ ...ays-fill-error_out-in-setup_one_line.patch | 44 +++ ...-status-byte-on-data-completion-erro.patch | 41 +++ ...ce-between-ipheth_close-and-error-ha.patch | 44 +++ ...bnet-modern-method-to-get-random-mac.patch | 75 +++++ ...advertise-mfp_capable-to-enable-wpa3.patch | 38 +++ ...not-return-unused-priv-in-mwifiex_ge.patch | 112 +++++++ 63 files changed, 4737 insertions(+) create mode 100644 queue-5.10/af_unix-remove-put_pid-put_cred-in-copy_peercred.patch create mode 100644 queue-5.10/alsa-hda-add-input-value-sanity-checks-to-hdmi-chann.patch create mode 100644 queue-5.10/asoc-topology-properly-initialize-soc_enum-values.patch create mode 100644 queue-5.10/ata-pata_macio-use-warn-instead-of-bug.patch create mode 100644 queue-5.10/bareudp-fix-device-stats-updates.patch create mode 100644 queue-5.10/btrfs-clean-up-our-handling-of-refs-0-in-snapshot-de.patch create mode 100644 queue-5.10/btrfs-initialize-location-to-fix-wmaybe-uninitialize.patch create mode 100644 queue-5.10/btrfs-replace-bug_on-with-assert-in-walk_down_proc.patch create mode 100644 queue-5.10/can-bcm-remove-proc-entry-when-dev-is-unregistered.patch create mode 100644 queue-5.10/cgroup-protect-css-cgroup-write-under-css_set_lock.patch create mode 100644 queue-5.10/devres-initialize-an-uninitialized-struct-member.patch create mode 100644 queue-5.10/dm-init-handle-minors-larger-than-255.patch create mode 100644 queue-5.10/drivers-net-usb-remove-all-strcpy-uses.patch create mode 100644 queue-5.10/fou-fix-null-ptr-deref-in-gro.patch create mode 100644 queue-5.10/fou-remove-sparse-errors.patch create mode 100644 queue-5.10/gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_co.patch create mode 100644 queue-5.10/gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_re.patch create mode 100644 queue-5.10/hid-cougar-fix-slab-out-of-bounds-read-in-cougar_rep.patch create mode 100644 queue-5.10/hwmon-adc128d818-fix-underflows-seen-when-writing-li.patch create mode 100644 queue-5.10/hwmon-lm95234-fix-underflows-seen-when-writing-limit.patch create mode 100644 queue-5.10/hwmon-nct6775-core-fix-underflows-seen-when-writing-.patch create mode 100644 queue-5.10/hwmon-w83627ehf-fix-underflows-seen-when-writing-lim.patch create mode 100644 queue-5.10/igb-fix-not-clearing-timesync-interrupts-for-82580.patch create mode 100644 queue-5.10/igc-unlock-on-error-in-igc_io_resume.patch create mode 100644 queue-5.10/input-uinput-reject-requests-with-unreasonable-numbe.patch create mode 100644 queue-5.10/iommu-sun50i-clear-bypass-register.patch create mode 100644 queue-5.10/iommu-vt-d-handle-volatile-descriptor-status-read.patch create mode 100644 queue-5.10/irqchip-armada-370-xp-do-not-allow-mapping-irq-0-and.patch create mode 100644 queue-5.10/irqchip-gic-v4-always-configure-affinity-on-vpe-acti.patch create mode 100644 queue-5.10/kselftests-dmabuf-heaps-ensure-the-driver-name-is-nu.patch create mode 100644 queue-5.10/leds-spi-byte-call-of_node_put-on-error-path.patch create mode 100644 queue-5.10/lib-generic-radix-tree.c-fix-rare-race-in-__genradix.patch create mode 100644 queue-5.10/libbpf-add-null-checks-to-bpf_object__-prev_map-next.patch create mode 100644 queue-5.10/media-qcom-camss-add-check-for-v4l2_fwnode_endpoint_.patch create mode 100644 queue-5.10/media-vivid-don-t-set-hdmi-tx-controls-if-there-are-.patch create mode 100644 queue-5.10/media-vivid-fix-wrong-sizeimage-value-for-mplane.patch create mode 100644 queue-5.10/mips-cevt-r4k-don-t-call-get_c0_compare_int-if-timer.patch create mode 100644 queue-5.10/net-bridge-br_fdb_external_learn_add-always-set-ext_.patch create mode 100644 queue-5.10/net-dpaa-avoid-on-stack-arrays-of-nr_cpus-elements.patch create mode 100644 queue-5.10/net-dsa-vsc73xx-fix-possible-subblocks-range-of-capt.patch create mode 100644 queue-5.10/net-usb-don-t-write-directly-to-netdev-dev_addr.patch create mode 100644 queue-5.10/netfilter-nf_conncount-fix-wrong-variable-type.patch create mode 100644 queue-5.10/nfsv4-add-missing-rescheduling-points-in-nfs_client_.patch create mode 100644 queue-5.10/of-irq-prevent-device-address-out-of-bounds-read-in-.patch create mode 100644 queue-5.10/pci-add-missing-bridge-lock-to-pci_bus_lock.patch create mode 100644 queue-5.10/pci-hotplug-pnv_php-fix-hotplug-driver-crash-on-powe.patch create mode 100644 queue-5.10/pci-keystone-add-workaround-for-errata-i2037-am65x-s.patch create mode 100644 queue-5.10/pcmcia-use-resource_size-function-on-resource-object.patch create mode 100644 queue-5.10/platform-x86-dell-smbios-fix-error-path-in-dell_smbi.patch create mode 100644 queue-5.10/s390-vmlinux.lds.s-move-ro_after_init-section-behind.patch create mode 100644 queue-5.10/smack-unix-sockets-fix-accept-ed-socket-label.patch create mode 100644 queue-5.10/smp-add-missing-destroy_work_on_stack-call-in-smp_ca.patch create mode 100644 queue-5.10/squashfs-sanity-check-symbolic-link-size.patch create mode 100644 queue-5.10/svcrdma-catch-another-reply-chunk-overflow-case.patch create mode 100644 queue-5.10/tcp_bpf-fix-return-value-of-tcp_bpf_sendmsg.patch-1053 create mode 100644 queue-5.10/udf-avoid-excessive-partition-lengths.patch create mode 100644 queue-5.10/um-line-always-fill-error_out-in-setup_one_line.patch create mode 100644 queue-5.10/usb-uas-set-host-status-byte-on-data-completion-erro.patch create mode 100644 queue-5.10/usbnet-ipheth-race-between-ipheth_close-and-error-ha.patch create mode 100644 queue-5.10/usbnet-modern-method-to-get-random-mac.patch create mode 100644 queue-5.10/wifi-brcmsmac-advertise-mfp_capable-to-enable-wpa3.patch create mode 100644 queue-5.10/wifi-mwifiex-do-not-return-unused-priv-in-mwifiex_ge.patch diff --git a/queue-5.10/af_unix-remove-put_pid-put_cred-in-copy_peercred.patch b/queue-5.10/af_unix-remove-put_pid-put_cred-in-copy_peercred.patch new file mode 100644 index 00000000000..a0946c5b536 --- /dev/null +++ b/queue-5.10/af_unix-remove-put_pid-put_cred-in-copy_peercred.patch @@ -0,0 +1,58 @@ +From f979f6980d149ddade3e08fc60399e9e631edbf6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Jun 2024 13:56:22 -0700 +Subject: af_unix: Remove put_pid()/put_cred() in copy_peercred(). + +From: Kuniyuki Iwashima + +[ Upstream commit e4bd881d987121dbf1a288641491955a53d9f8f7 ] + +When (AF_UNIX, SOCK_STREAM) socket connect()s to a listening socket, +the listener's sk_peer_pid/sk_peer_cred are copied to the client in +copy_peercred(). + +Then, the client's sk_peer_pid and sk_peer_cred are always NULL, so +we need not call put_pid() and put_cred() there. + +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/unix/af_unix.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c +index e2ff610d2776..b7e9c1238516 100644 +--- a/net/unix/af_unix.c ++++ b/net/unix/af_unix.c +@@ -603,9 +603,6 @@ static void init_peercred(struct sock *sk) + + static void copy_peercred(struct sock *sk, struct sock *peersk) + { +- const struct cred *old_cred; +- struct pid *old_pid; +- + if (sk < peersk) { + spin_lock(&sk->sk_peer_lock); + spin_lock_nested(&peersk->sk_peer_lock, SINGLE_DEPTH_NESTING); +@@ -613,16 +610,12 @@ static void copy_peercred(struct sock *sk, struct sock *peersk) + spin_lock(&peersk->sk_peer_lock); + spin_lock_nested(&sk->sk_peer_lock, SINGLE_DEPTH_NESTING); + } +- old_pid = sk->sk_peer_pid; +- old_cred = sk->sk_peer_cred; ++ + sk->sk_peer_pid = get_pid(peersk->sk_peer_pid); + sk->sk_peer_cred = get_cred(peersk->sk_peer_cred); + + spin_unlock(&sk->sk_peer_lock); + spin_unlock(&peersk->sk_peer_lock); +- +- put_pid(old_pid); +- put_cred(old_cred); + } + + static int unix_listen(struct socket *sock, int backlog) +-- +2.43.0 + diff --git a/queue-5.10/alsa-hda-add-input-value-sanity-checks-to-hdmi-chann.patch b/queue-5.10/alsa-hda-add-input-value-sanity-checks-to-hdmi-chann.patch new file mode 100644 index 00000000000..0a16ddc30ff --- /dev/null +++ b/queue-5.10/alsa-hda-add-input-value-sanity-checks-to-hdmi-chann.patch @@ -0,0 +1,61 @@ +From a858e8334e6f0d6804024d09bc385af79e2aacdf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Jun 2024 09:34:47 +0200 +Subject: ALSA: hda: Add input value sanity checks to HDMI channel map controls + +From: Takashi Iwai + +[ Upstream commit 6278056e42d953e207e2afd416be39d09ed2d496 ] + +Add a simple sanity check to HD-audio HDMI Channel Map controls. +Although the value might not be accepted for the actual connection, we +can filter out some bogus values beforehand, and that should be enough +for making kselftest happier. + +Reviewed-by: Jaroslav Kysela +Signed-off-by: Takashi Iwai +Link: https://lore.kernel.org/20240616073454.16512-7-tiwai@suse.de +Signed-off-by: Sasha Levin +--- + sound/hda/hdmi_chmap.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/sound/hda/hdmi_chmap.c b/sound/hda/hdmi_chmap.c +index aad5c4bf4d34..0ebf4d907852 100644 +--- a/sound/hda/hdmi_chmap.c ++++ b/sound/hda/hdmi_chmap.c +@@ -753,6 +753,20 @@ static int hdmi_chmap_ctl_get(struct snd_kcontrol *kcontrol, + return 0; + } + ++/* a simple sanity check for input values to chmap kcontrol */ ++static int chmap_value_check(struct hdac_chmap *hchmap, ++ const struct snd_ctl_elem_value *ucontrol) ++{ ++ int i; ++ ++ for (i = 0; i < hchmap->channels_max; i++) { ++ if (ucontrol->value.integer.value[i] < 0 || ++ ucontrol->value.integer.value[i] > SNDRV_CHMAP_LAST) ++ return -EINVAL; ++ } ++ return 0; ++} ++ + static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) + { +@@ -764,6 +778,10 @@ static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol, + unsigned char chmap[8], per_pin_chmap[8]; + int i, err, ca, prepared = 0; + ++ err = chmap_value_check(hchmap, ucontrol); ++ if (err < 0) ++ return err; ++ + /* No monitor is connected in dyn_pcm_assign. + * It's invalid to setup the chmap + */ +-- +2.43.0 + diff --git a/queue-5.10/asoc-topology-properly-initialize-soc_enum-values.patch b/queue-5.10/asoc-topology-properly-initialize-soc_enum-values.patch new file mode 100644 index 00000000000..bd61dbd1f90 --- /dev/null +++ b/queue-5.10/asoc-topology-properly-initialize-soc_enum-values.patch @@ -0,0 +1,38 @@ +From dba347df1477610d71353d98f58ea8a1132df7ed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jun 2024 12:18:40 +0200 +Subject: ASoC: topology: Properly initialize soc_enum values +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Amadeusz Sławiński + +[ Upstream commit 8ec2a2643544ce352f012ad3d248163199d05dfc ] + +soc_tplg_denum_create_values() should properly set its values field. + +Signed-off-by: Amadeusz Sławiński +Link: https://patch.msgid.link/20240627101850.2191513-4-amadeuszx.slawinski@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/soc-topology.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c +index 23a5f9a52da0..aa57f796e9dd 100644 +--- a/sound/soc/soc-topology.c ++++ b/sound/soc/soc-topology.c +@@ -998,6 +998,8 @@ static int soc_tplg_denum_create_values(struct soc_enum *se, + se->dobj.control.dvalues[i] = le32_to_cpu(ec->values[i]); + } + ++ se->items = le32_to_cpu(ec->items); ++ se->values = (const unsigned int *)se->dobj.control.dvalues; + return 0; + } + +-- +2.43.0 + diff --git a/queue-5.10/ata-pata_macio-use-warn-instead-of-bug.patch b/queue-5.10/ata-pata_macio-use-warn-instead-of-bug.patch new file mode 100644 index 00000000000..51d3f84aeae --- /dev/null +++ b/queue-5.10/ata-pata_macio-use-warn-instead-of-bug.patch @@ -0,0 +1,53 @@ +From 6adc6ac377a7026b6d9c853b7b57d1c5ebef3409 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 20 Aug 2024 13:04:07 +1000 +Subject: ata: pata_macio: Use WARN instead of BUG + +From: Michael Ellerman + +[ Upstream commit d4bc0a264fb482b019c84fbc7202dd3cab059087 ] + +The overflow/underflow conditions in pata_macio_qc_prep() should never +happen. But if they do there's no need to kill the system entirely, a +WARN and failing the IO request should be sufficient and might allow the +system to keep running. + +Signed-off-by: Michael Ellerman +Signed-off-by: Damien Le Moal +Signed-off-by: Sasha Levin +--- + drivers/ata/pata_macio.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c +index e47a28271f5b..ba8f0084075b 100644 +--- a/drivers/ata/pata_macio.c ++++ b/drivers/ata/pata_macio.c +@@ -540,7 +540,8 @@ static enum ata_completion_errors pata_macio_qc_prep(struct ata_queued_cmd *qc) + + while (sg_len) { + /* table overflow should never happen */ +- BUG_ON (pi++ >= MAX_DCMDS); ++ if (WARN_ON_ONCE(pi >= MAX_DCMDS)) ++ return AC_ERR_SYSTEM; + + len = (sg_len < MAX_DBDMA_SEG) ? sg_len : MAX_DBDMA_SEG; + table->command = cpu_to_le16(write ? OUTPUT_MORE: INPUT_MORE); +@@ -552,11 +553,13 @@ static enum ata_completion_errors pata_macio_qc_prep(struct ata_queued_cmd *qc) + addr += len; + sg_len -= len; + ++table; ++ ++pi; + } + } + + /* Should never happen according to Tejun */ +- BUG_ON(!pi); ++ if (WARN_ON_ONCE(!pi)) ++ return AC_ERR_SYSTEM; + + /* Convert the last command to an input/output */ + table--; +-- +2.43.0 + diff --git a/queue-5.10/bareudp-fix-device-stats-updates.patch b/queue-5.10/bareudp-fix-device-stats-updates.patch new file mode 100644 index 00000000000..188e84c0d6e --- /dev/null +++ b/queue-5.10/bareudp-fix-device-stats-updates.patch @@ -0,0 +1,106 @@ +From 2661ffff55195a07a8ee73c0a3c9e23d7276d043 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 30 Aug 2024 17:31:07 +0200 +Subject: bareudp: Fix device stats updates. + +From: Guillaume Nault + +[ Upstream commit 4963d2343af81f493519f9c3ea9f2169eaa7353a ] + +Bareudp devices update their stats concurrently. +Therefore they need proper atomic increments. + +Fixes: 571912c69f0e ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.") +Signed-off-by: Guillaume Nault +Reviewed-by: Willem de Bruijn +Link: https://patch.msgid.link/04b7b9d0b480158eb3ab4366ec80aa2ab7e41fcb.1725031794.git.gnault@redhat.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/bareudp.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c +index 53ef48588e59..d9917120b8fa 100644 +--- a/drivers/net/bareudp.c ++++ b/drivers/net/bareudp.c +@@ -75,7 +75,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) + + if (skb_copy_bits(skb, BAREUDP_BASE_HLEN, &ipversion, + sizeof(ipversion))) { +- bareudp->dev->stats.rx_dropped++; ++ DEV_STATS_INC(bareudp->dev, rx_dropped); + goto drop; + } + ipversion >>= 4; +@@ -85,7 +85,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) + } else if (ipversion == 6 && bareudp->multi_proto_mode) { + proto = htons(ETH_P_IPV6); + } else { +- bareudp->dev->stats.rx_dropped++; ++ DEV_STATS_INC(bareudp->dev, rx_dropped); + goto drop; + } + } else if (bareudp->ethertype == htons(ETH_P_MPLS_UC)) { +@@ -99,7 +99,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) + ipv4_is_multicast(tunnel_hdr->daddr)) { + proto = htons(ETH_P_MPLS_MC); + } else { +- bareudp->dev->stats.rx_dropped++; ++ DEV_STATS_INC(bareudp->dev, rx_dropped); + goto drop; + } + } else { +@@ -115,7 +115,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) + (addr_type & IPV6_ADDR_MULTICAST)) { + proto = htons(ETH_P_MPLS_MC); + } else { +- bareudp->dev->stats.rx_dropped++; ++ DEV_STATS_INC(bareudp->dev, rx_dropped); + goto drop; + } + } +@@ -127,12 +127,12 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) + proto, + !net_eq(bareudp->net, + dev_net(bareudp->dev)))) { +- bareudp->dev->stats.rx_dropped++; ++ DEV_STATS_INC(bareudp->dev, rx_dropped); + goto drop; + } + tun_dst = udp_tun_rx_dst(skb, family, TUNNEL_KEY, 0, 0); + if (!tun_dst) { +- bareudp->dev->stats.rx_dropped++; ++ DEV_STATS_INC(bareudp->dev, rx_dropped); + goto drop; + } + skb_dst_set(skb, &tun_dst->dst); +@@ -157,8 +157,8 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) + &((struct ipv6hdr *)oiph)->saddr); + } + if (err > 1) { +- ++bareudp->dev->stats.rx_frame_errors; +- ++bareudp->dev->stats.rx_errors; ++ DEV_STATS_INC(bareudp->dev, rx_frame_errors); ++ DEV_STATS_INC(bareudp->dev, rx_errors); + goto drop; + } + } +@@ -453,11 +453,11 @@ static netdev_tx_t bareudp_xmit(struct sk_buff *skb, struct net_device *dev) + dev_kfree_skb(skb); + + if (err == -ELOOP) +- dev->stats.collisions++; ++ DEV_STATS_INC(dev, collisions); + else if (err == -ENETUNREACH) +- dev->stats.tx_carrier_errors++; ++ DEV_STATS_INC(dev, tx_carrier_errors); + +- dev->stats.tx_errors++; ++ DEV_STATS_INC(dev, tx_errors); + return NETDEV_TX_OK; + } + +-- +2.43.0 + diff --git a/queue-5.10/btrfs-clean-up-our-handling-of-refs-0-in-snapshot-de.patch b/queue-5.10/btrfs-clean-up-our-handling-of-refs-0-in-snapshot-de.patch new file mode 100644 index 00000000000..7ec6ebb3d8a --- /dev/null +++ b/queue-5.10/btrfs-clean-up-our-handling-of-refs-0-in-snapshot-de.patch @@ -0,0 +1,90 @@ +From e4d03aaa85598ef4527c4363c3e1ac124af79b2b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 14:12:13 -0400 +Subject: btrfs: clean up our handling of refs == 0 in snapshot delete + +From: Josef Bacik + +[ Upstream commit b8ccef048354074a548f108e51d0557d6adfd3a3 ] + +In reada we BUG_ON(refs == 0), which could be unkind since we aren't +holding a lock on the extent leaf and thus could get a transient +incorrect answer. In walk_down_proc we also BUG_ON(refs == 0), which +could happen if we have extent tree corruption. Change that to return +-EUCLEAN. In do_walk_down() we catch this case and handle it correctly, +however we return -EIO, which -EUCLEAN is a more appropriate error code. +Finally in walk_up_proc we have the same BUG_ON(refs == 0), so convert +that to proper error handling. Also adjust the error message so we can +actually do something with the information. + +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/extent-tree.c | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c +index 22fee61bb51a..afa1eccd5e2d 100644 +--- a/fs/btrfs/extent-tree.c ++++ b/fs/btrfs/extent-tree.c +@@ -4806,7 +4806,15 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans, + /* We don't care about errors in readahead. */ + if (ret < 0) + continue; +- BUG_ON(refs == 0); ++ ++ /* ++ * This could be racey, it's conceivable that we raced and end ++ * up with a bogus refs count, if that's the case just skip, if ++ * we are actually corrupt we will notice when we look up ++ * everything again with our locks. ++ */ ++ if (refs == 0) ++ continue; + + if (wc->stage == DROP_REFERENCE) { + if (refs == 1) +@@ -4873,7 +4881,11 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans, + BUG_ON(ret == -ENOMEM); + if (ret) + return ret; +- BUG_ON(wc->refs[level] == 0); ++ if (unlikely(wc->refs[level] == 0)) { ++ btrfs_err(fs_info, "bytenr %llu has 0 references, expect > 0", ++ eb->start); ++ return -EUCLEAN; ++ } + } + + if (wc->stage == DROP_REFERENCE) { +@@ -5006,8 +5018,9 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, + goto out_unlock; + + if (unlikely(wc->refs[level - 1] == 0)) { +- btrfs_err(fs_info, "Missing references."); +- ret = -EIO; ++ btrfs_err(fs_info, "bytenr %llu has 0 references, expect > 0", ++ bytenr); ++ ret = -EUCLEAN; + goto out_unlock; + } + *lookup_info = 0; +@@ -5209,7 +5222,12 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, + path->locks[level] = 0; + return ret; + } +- BUG_ON(wc->refs[level] == 0); ++ if (unlikely(wc->refs[level] == 0)) { ++ btrfs_tree_unlock_rw(eb, path->locks[level]); ++ btrfs_err(fs_info, "bytenr %llu has 0 references, expect > 0", ++ eb->start); ++ return -EUCLEAN; ++ } + if (wc->refs[level] == 1) { + btrfs_tree_unlock_rw(eb, path->locks[level]); + path->locks[level] = 0; +-- +2.43.0 + diff --git a/queue-5.10/btrfs-initialize-location-to-fix-wmaybe-uninitialize.patch b/queue-5.10/btrfs-initialize-location-to-fix-wmaybe-uninitialize.patch new file mode 100644 index 00000000000..28a83bf2ec5 --- /dev/null +++ b/queue-5.10/btrfs-initialize-location-to-fix-wmaybe-uninitialize.patch @@ -0,0 +1,56 @@ +From 0abb5c66891230e04900f45037abab2cca18133c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jul 2024 21:59:24 +0200 +Subject: btrfs: initialize location to fix -Wmaybe-uninitialized in + btrfs_lookup_dentry() + +From: David Sterba + +[ Upstream commit b8e947e9f64cac9df85a07672b658df5b2bcff07 ] + +Some arch + compiler combinations report a potentially unused variable +location in btrfs_lookup_dentry(). This is a false alert as the variable +is passed by value and always valid or there's an error. The compilers +cannot probably reason about that although btrfs_inode_by_name() is in +the same file. + + > + /kisskb/src/fs/btrfs/inode.c: error: 'location.objectid' may be used + +uninitialized in this function [-Werror=maybe-uninitialized]: => 5603:9 + > + /kisskb/src/fs/btrfs/inode.c: error: 'location.type' may be used + +uninitialized in this function [-Werror=maybe-uninitialized]: => 5674:5 + + m68k-gcc8/m68k-allmodconfig + mips-gcc8/mips-allmodconfig + powerpc-gcc5/powerpc-all{mod,yes}config + powerpc-gcc5/ppc64_defconfig + +Initialize it to zero, this should fix the warnings and won't change the +behaviour as btrfs_inode_by_name() accepts only a root or inode item +types, otherwise returns an error. + +Reported-by: Geert Uytterhoeven +Tested-by: Geert Uytterhoeven +Link: https://lore.kernel.org/linux-btrfs/bd4e9928-17b3-9257-8ba7-6b7f9bbb639a@linux-m68k.org/ +Reviewed-by: Qu Wenruo +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c +index 4bf28f74605f..cd3156a9a268 100644 +--- a/fs/btrfs/inode.c ++++ b/fs/btrfs/inode.c +@@ -5527,7 +5527,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry) + struct inode *inode; + struct btrfs_root *root = BTRFS_I(dir)->root; + struct btrfs_root *sub_root = root; +- struct btrfs_key location; ++ struct btrfs_key location = { 0 }; + u8 di_type = 0; + int ret = 0; + +-- +2.43.0 + diff --git a/queue-5.10/btrfs-replace-bug_on-with-assert-in-walk_down_proc.patch b/queue-5.10/btrfs-replace-bug_on-with-assert-in-walk_down_proc.patch new file mode 100644 index 00000000000..8e6d2821e02 --- /dev/null +++ b/queue-5.10/btrfs-replace-bug_on-with-assert-in-walk_down_proc.patch @@ -0,0 +1,46 @@ +From f18cb8d45cee87d3befe3d898a7e67ba1f6769dc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 14:12:12 -0400 +Subject: btrfs: replace BUG_ON with ASSERT in walk_down_proc() + +From: Josef Bacik + +[ Upstream commit 1f9d44c0a12730a24f8bb75c5e1102207413cc9b ] + +We have a couple of areas where we check to make sure the tree block is +locked before looking up or messing with references. This is old code +so it has this as BUG_ON(). Convert this to ASSERT() for developers. + +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/extent-tree.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c +index 3ba43a40032c..22fee61bb51a 100644 +--- a/fs/btrfs/extent-tree.c ++++ b/fs/btrfs/extent-tree.c +@@ -4865,7 +4865,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans, + if (lookup_info && + ((wc->stage == DROP_REFERENCE && wc->refs[level] != 1) || + (wc->stage == UPDATE_BACKREF && !(wc->flags[level] & flag)))) { +- BUG_ON(!path->locks[level]); ++ ASSERT(path->locks[level]); + ret = btrfs_lookup_extent_info(trans, fs_info, + eb->start, level, 1, + &wc->refs[level], +@@ -4889,7 +4889,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans, + + /* wc->stage == UPDATE_BACKREF */ + if (!(wc->flags[level] & flag)) { +- BUG_ON(!path->locks[level]); ++ ASSERT(path->locks[level]); + ret = btrfs_inc_ref(trans, root, eb, 1); + BUG_ON(ret); /* -ENOMEM */ + ret = btrfs_dec_ref(trans, root, eb, 0); +-- +2.43.0 + diff --git a/queue-5.10/can-bcm-remove-proc-entry-when-dev-is-unregistered.patch b/queue-5.10/can-bcm-remove-proc-entry-when-dev-is-unregistered.patch new file mode 100644 index 00000000000..55ca72111da --- /dev/null +++ b/queue-5.10/can-bcm-remove-proc-entry-when-dev-is-unregistered.patch @@ -0,0 +1,99 @@ +From 4ff2a4e4fc1ff08c37d4418483c515ce8e28b8e1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Jul 2024 12:28:42 -0700 +Subject: can: bcm: Remove proc entry when dev is unregistered. + +From: Kuniyuki Iwashima + +[ Upstream commit 76fe372ccb81b0c89b6cd2fec26e2f38c958be85 ] + +syzkaller reported a warning in bcm_connect() below. [0] + +The repro calls connect() to vxcan1, removes vxcan1, and calls +connect() with ifindex == 0. + +Calling connect() for a BCM socket allocates a proc entry. +Then, bcm_sk(sk)->bound is set to 1 to prevent further connect(). + +However, removing the bound device resets bcm_sk(sk)->bound to 0 +in bcm_notify(). + +The 2nd connect() tries to allocate a proc entry with the same +name and sets NULL to bcm_sk(sk)->bcm_proc_read, leaking the +original proc entry. + +Since the proc entry is available only for connect()ed sockets, +let's clean up the entry when the bound netdev is unregistered. + +[0]: +proc_dir_entry 'can-bcm/2456' already registered +WARNING: CPU: 1 PID: 394 at fs/proc/generic.c:376 proc_register+0x645/0x8f0 fs/proc/generic.c:375 +Modules linked in: +CPU: 1 PID: 394 Comm: syz-executor403 Not tainted 6.10.0-rc7-g852e42cc2dd4 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 +RIP: 0010:proc_register+0x645/0x8f0 fs/proc/generic.c:375 +Code: 00 00 00 00 00 48 85 ed 0f 85 97 02 00 00 4d 85 f6 0f 85 9f 02 00 00 48 c7 c7 9b cb cf 87 48 89 de 4c 89 fa e8 1c 6f eb fe 90 <0f> 0b 90 90 48 c7 c7 98 37 99 89 e8 cb 7e 22 05 bb 00 00 00 10 48 +RSP: 0018:ffa0000000cd7c30 EFLAGS: 00010246 +RAX: 9e129be1950f0200 RBX: ff1100011b51582c RCX: ff1100011857cd80 +RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000002 +RBP: 0000000000000000 R08: ffd400000000000f R09: ff1100013e78cac0 +R10: ffac800000cd7980 R11: ff1100013e12b1f0 R12: 0000000000000000 +R13: 0000000000000000 R14: 0000000000000000 R15: ff1100011a99a2ec +FS: 00007fbd7086f740(0000) GS:ff1100013fd00000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 00000000200071c0 CR3: 0000000118556004 CR4: 0000000000771ef0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe07f0 DR7: 0000000000000400 +PKRU: 55555554 +Call Trace: + + proc_create_net_single+0x144/0x210 fs/proc/proc_net.c:220 + bcm_connect+0x472/0x840 net/can/bcm.c:1673 + __sys_connect_file net/socket.c:2049 [inline] + __sys_connect+0x5d2/0x690 net/socket.c:2066 + __do_sys_connect net/socket.c:2076 [inline] + __se_sys_connect net/socket.c:2073 [inline] + __x64_sys_connect+0x8f/0x100 net/socket.c:2073 + do_syscall_x64 arch/x86/entry/common.c:52 [inline] + do_syscall_64+0xd9/0x1c0 arch/x86/entry/common.c:83 + entry_SYSCALL_64_after_hwframe+0x4b/0x53 +RIP: 0033:0x7fbd708b0e5d +Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 73 9f 1b 00 f7 d8 64 89 01 48 +RSP: 002b:00007fff8cd33f08 EFLAGS: 00000246 ORIG_RAX: 000000000000002a +RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007fbd708b0e5d +RDX: 0000000000000010 RSI: 0000000020000040 RDI: 0000000000000003 +RBP: 0000000000000000 R08: 0000000000000040 R09: 0000000000000040 +R10: 0000000000000040 R11: 0000000000000246 R12: 00007fff8cd34098 +R13: 0000000000401280 R14: 0000000000406de8 R15: 00007fbd70ab9000 + +remove_proc_entry: removing non-empty directory 'net/can-bcm', leaking at least '2456' + +Fixes: ffd980f976e7 ("[CAN]: Add broadcast manager (bcm) protocol") +Reported-by: syzkaller +Signed-off-by: Kuniyuki Iwashima +Reviewed-by: Simon Horman +Link: https://lore.kernel.org/all/20240722192842.37421-1-kuniyu@amazon.com +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Sasha Levin +--- + net/can/bcm.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/net/can/bcm.c b/net/can/bcm.c +index 2388c619f29c..b2b1bd672787 100644 +--- a/net/can/bcm.c ++++ b/net/can/bcm.c +@@ -1423,6 +1423,10 @@ static void bcm_notify(struct bcm_sock *bo, unsigned long msg, + + /* remove device reference, if this is our bound device */ + if (bo->bound && bo->ifindex == dev->ifindex) { ++#if IS_ENABLED(CONFIG_PROC_FS) ++ if (sock_net(sk)->can.bcmproc_dir && bo->bcm_proc_read) ++ remove_proc_entry(bo->procname, sock_net(sk)->can.bcmproc_dir); ++#endif + bo->bound = 0; + bo->ifindex = 0; + notify_enodev = 1; +-- +2.43.0 + diff --git a/queue-5.10/cgroup-protect-css-cgroup-write-under-css_set_lock.patch b/queue-5.10/cgroup-protect-css-cgroup-write-under-css_set_lock.patch new file mode 100644 index 00000000000..6e7e3e2a8ab --- /dev/null +++ b/queue-5.10/cgroup-protect-css-cgroup-write-under-css_set_lock.patch @@ -0,0 +1,45 @@ +From 4cea1c1df19c3a7b4ad6c201d66a81bf6ad9069e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jul 2024 14:52:29 -0400 +Subject: cgroup: Protect css->cgroup write under css_set_lock + +From: Waiman Long + +[ Upstream commit 57b56d16800e8961278ecff0dc755d46c4575092 ] + +The writing of css->cgroup associated with the cgroup root in +rebind_subsystems() is currently protected only by cgroup_mutex. +However, the reading of css->cgroup in both proc_cpuset_show() and +proc_cgroup_show() is protected just by css_set_lock. That makes the +readers susceptible to racing problems like data tearing or caching. +It is also a problem that can be reported by KCSAN. + +This can be fixed by using READ_ONCE() and WRITE_ONCE() to access +css->cgroup. Alternatively, the writing of css->cgroup can be moved +under css_set_lock as well which is done by this patch. + +Signed-off-by: Waiman Long +Signed-off-by: Tejun Heo +Signed-off-by: Sasha Levin +--- + kernel/cgroup/cgroup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c +index 030eaed1f06b..643d8e178f7b 100644 +--- a/kernel/cgroup/cgroup.c ++++ b/kernel/cgroup/cgroup.c +@@ -1773,9 +1773,9 @@ int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask) + RCU_INIT_POINTER(scgrp->subsys[ssid], NULL); + rcu_assign_pointer(dcgrp->subsys[ssid], css); + ss->root = dst_root; +- css->cgroup = dcgrp; + + spin_lock_irq(&css_set_lock); ++ css->cgroup = dcgrp; + WARN_ON(!list_empty(&dcgrp->e_csets[ss->id])); + list_for_each_entry_safe(cset, cset_pos, &scgrp->e_csets[ss->id], + e_cset_node[ss->id]) { +-- +2.43.0 + diff --git a/queue-5.10/devres-initialize-an-uninitialized-struct-member.patch b/queue-5.10/devres-initialize-an-uninitialized-struct-member.patch new file mode 100644 index 00000000000..762dd6768a5 --- /dev/null +++ b/queue-5.10/devres-initialize-an-uninitialized-struct-member.patch @@ -0,0 +1,35 @@ +From 5219a2989e93f2ab85f369e39b505ec8974f7b4c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Jul 2024 22:51:52 +0800 +Subject: devres: Initialize an uninitialized struct member + +From: Zijun Hu + +[ Upstream commit 56a20ad349b5c51909cf8810f7c79b288864ad33 ] + +Initialize an uninitialized struct member for driver API +devres_open_group(). + +Signed-off-by: Zijun Hu +Link: https://lore.kernel.org/r/1719931914-19035-4-git-send-email-quic_zijuhu@quicinc.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/base/devres.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/base/devres.c b/drivers/base/devres.c +index 8a74008c13c4..e3a735d0213a 100644 +--- a/drivers/base/devres.c ++++ b/drivers/base/devres.c +@@ -577,6 +577,7 @@ void * devres_open_group(struct device *dev, void *id, gfp_t gfp) + grp->id = grp; + if (id) + grp->id = id; ++ grp->color = 0; + + spin_lock_irqsave(&dev->devres_lock, flags); + add_dr(dev, &grp->node[0]); +-- +2.43.0 + diff --git a/queue-5.10/dm-init-handle-minors-larger-than-255.patch b/queue-5.10/dm-init-handle-minors-larger-than-255.patch new file mode 100644 index 00000000000..48b96f7888a --- /dev/null +++ b/queue-5.10/dm-init-handle-minors-larger-than-255.patch @@ -0,0 +1,43 @@ +From 91efe177dd708ef630e607f21f86a09b8d9be3d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Jul 2024 12:13:24 +0200 +Subject: dm init: Handle minors larger than 255 + +From: Benjamin Marzinski + +[ Upstream commit 140ce37fd78a629105377e17842465258a5459ef ] + +dm_parse_device_entry() simply copies the minor number into dmi.dev, but +the dev_t format splits the minor number between the lowest 8 bytes and +highest 12 bytes. If the minor number is larger than 255, part of it +will end up getting treated as the major number + +Fix this by checking that the minor number is valid and then encoding it +as a dev_t. + +Signed-off-by: Benjamin Marzinski +Signed-off-by: Mikulas Patocka +Signed-off-by: Sasha Levin +--- + drivers/md/dm-init.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/md/dm-init.c b/drivers/md/dm-init.c +index b0c45c6ebe0b..f76477044ec1 100644 +--- a/drivers/md/dm-init.c ++++ b/drivers/md/dm-init.c +@@ -207,8 +207,10 @@ static char __init *dm_parse_device_entry(struct dm_device *dev, char *str) + strscpy(dev->dmi.uuid, field[1], sizeof(dev->dmi.uuid)); + /* minor */ + if (strlen(field[2])) { +- if (kstrtoull(field[2], 0, &dev->dmi.dev)) ++ if (kstrtoull(field[2], 0, &dev->dmi.dev) || ++ dev->dmi.dev >= (1 << MINORBITS)) + return ERR_PTR(-EINVAL); ++ dev->dmi.dev = huge_encode_dev((dev_t)dev->dmi.dev); + dev->dmi.flags |= DM_PERSISTENT_DEV_FLAG; + } + /* flags */ +-- +2.43.0 + diff --git a/queue-5.10/drivers-net-usb-remove-all-strcpy-uses.patch b/queue-5.10/drivers-net-usb-remove-all-strcpy-uses.patch new file mode 100644 index 00000000000..bb896e8997d --- /dev/null +++ b/queue-5.10/drivers-net-usb-remove-all-strcpy-uses.patch @@ -0,0 +1,68 @@ +From cfba0f00388ad495c3e1088cf98309d95916b395 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 1 Aug 2021 19:12:26 +0200 +Subject: drivers/net/usb: Remove all strcpy() uses + +From: Len Baker + +[ Upstream commit 493c3ca6bd754d8587604496eb814f72e933075d ] + +strcpy() performs no bounds checking on the destination buffer. This +could result in linear overflows beyond the end of the buffer, leading +to all kinds of misbehaviors. The safe replacement is strscpy(). + +Signed-off-by: Len Baker +Signed-off-by: David S. Miller +Stable-dep-of: bab8eb0dd4cb ("usbnet: modern method to get random MAC") +Signed-off-by: Sasha Levin +--- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/usbnet.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c +index 06d9f19ca142..d56e276e4d80 100644 +--- a/drivers/net/usb/ipheth.c ++++ b/drivers/net/usb/ipheth.c +@@ -443,7 +443,7 @@ static int ipheth_probe(struct usb_interface *intf, + + netdev->netdev_ops = &ipheth_netdev_ops; + netdev->watchdog_timeo = IPHETH_TX_TIMEOUT; +- strcpy(netdev->name, "eth%d"); ++ strscpy(netdev->name, "eth%d", sizeof(netdev->name)); + + dev = netdev_priv(netdev); + dev->udev = udev; +diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c +index 481a41d879b5..01f80aea1605 100644 +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -1693,7 +1693,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) + dev->interrupt_count = 0; + + dev->net = net; +- strcpy (net->name, "usb%d"); ++ strscpy(net->name, "usb%d", sizeof(net->name)); + memcpy (net->dev_addr, node_id, sizeof node_id); + + /* rx and tx sides can use different message sizes; +@@ -1720,13 +1720,13 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) + if ((dev->driver_info->flags & FLAG_ETHER) != 0 && + ((dev->driver_info->flags & FLAG_POINTTOPOINT) == 0 || + (net->dev_addr [0] & 0x02) == 0)) +- strcpy (net->name, "eth%d"); ++ strscpy(net->name, "eth%d", sizeof(net->name)); + /* WLAN devices should always be named "wlan%d" */ + if ((dev->driver_info->flags & FLAG_WLAN) != 0) +- strcpy(net->name, "wlan%d"); ++ strscpy(net->name, "wlan%d", sizeof(net->name)); + /* WWAN devices should always be named "wwan%d" */ + if ((dev->driver_info->flags & FLAG_WWAN) != 0) +- strcpy(net->name, "wwan%d"); ++ strscpy(net->name, "wwan%d", sizeof(net->name)); + + /* devices that cannot do ARP */ + if ((dev->driver_info->flags & FLAG_NOARP) != 0) +-- +2.43.0 + diff --git a/queue-5.10/fou-fix-null-ptr-deref-in-gro.patch b/queue-5.10/fou-fix-null-ptr-deref-in-gro.patch new file mode 100644 index 00000000000..15638692d96 --- /dev/null +++ b/queue-5.10/fou-fix-null-ptr-deref-in-gro.patch @@ -0,0 +1,172 @@ +From 21280eabe33faa52805f2df41a003116566051e1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 Sep 2024 10:39:27 -0700 +Subject: fou: Fix null-ptr-deref in GRO. + +From: Kuniyuki Iwashima + +[ Upstream commit 7e4196935069947d8b70b09c1660b67b067e75cb ] + +We observed a null-ptr-deref in fou_gro_receive() while shutting down +a host. [0] + +The NULL pointer is sk->sk_user_data, and the offset 8 is of protocol +in struct fou. + +When fou_release() is called due to netns dismantle or explicit tunnel +teardown, udp_tunnel_sock_release() sets NULL to sk->sk_user_data. +Then, the tunnel socket is destroyed after a single RCU grace period. + +So, in-flight udp4_gro_receive() could find the socket and execute the +FOU GRO handler, where sk->sk_user_data could be NULL. + +Let's use rcu_dereference_sk_user_data() in fou_from_sock() and add NULL +checks in FOU GRO handlers. + +[0]: +BUG: kernel NULL pointer dereference, address: 0000000000000008 + PF: supervisor read access in kernel mode + PF: error_code(0x0000) - not-present page +PGD 80000001032f4067 P4D 80000001032f4067 PUD 103240067 PMD 0 +SMP PTI +CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.10.216-204.855.amzn2.x86_64 #1 +Hardware name: Amazon EC2 c5.large/, BIOS 1.0 10/16/2017 +RIP: 0010:fou_gro_receive (net/ipv4/fou.c:233) [fou] +Code: 41 5f c3 cc cc cc cc e8 e7 2e 69 f4 0f 1f 80 00 00 00 00 0f 1f 44 00 00 49 89 f8 41 54 48 89 f7 48 89 d6 49 8b 80 88 02 00 00 <0f> b6 48 08 0f b7 42 4a 66 25 fd fd 80 cc 02 66 89 42 4a 0f b6 42 +RSP: 0018:ffffa330c0003d08 EFLAGS: 00010297 +RAX: 0000000000000000 RBX: ffff93d9e3a6b900 RCX: 0000000000000010 +RDX: ffff93d9e3a6b900 RSI: ffff93d9e3a6b900 RDI: ffff93dac2e24d08 +RBP: ffff93d9e3a6b900 R08: ffff93dacbce6400 R09: 0000000000000002 +R10: 0000000000000000 R11: ffffffffb5f369b0 R12: ffff93dacbce6400 +R13: ffff93dac2e24d08 R14: 0000000000000000 R15: ffffffffb4edd1c0 +FS: 0000000000000000(0000) GS:ffff93daee800000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 0000000000000008 CR3: 0000000102140001 CR4: 00000000007706f0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +PKRU: 55555554 +Call Trace: + + ? show_trace_log_lvl (arch/x86/kernel/dumpstack.c:259) + ? __die_body.cold (arch/x86/kernel/dumpstack.c:478 arch/x86/kernel/dumpstack.c:420) + ? no_context (arch/x86/mm/fault.c:752) + ? exc_page_fault (arch/x86/include/asm/irqflags.h:49 arch/x86/include/asm/irqflags.h:89 arch/x86/mm/fault.c:1435 arch/x86/mm/fault.c:1483) + ? asm_exc_page_fault (arch/x86/include/asm/idtentry.h:571) + ? fou_gro_receive (net/ipv4/fou.c:233) [fou] + udp_gro_receive (include/linux/netdevice.h:2552 net/ipv4/udp_offload.c:559) + udp4_gro_receive (net/ipv4/udp_offload.c:604) + inet_gro_receive (net/ipv4/af_inet.c:1549 (discriminator 7)) + dev_gro_receive (net/core/dev.c:6035 (discriminator 4)) + napi_gro_receive (net/core/dev.c:6170) + ena_clean_rx_irq (drivers/amazon/net/ena/ena_netdev.c:1558) [ena] + ena_io_poll (drivers/amazon/net/ena/ena_netdev.c:1742) [ena] + napi_poll (net/core/dev.c:6847) + net_rx_action (net/core/dev.c:6917) + __do_softirq (arch/x86/include/asm/jump_label.h:25 include/linux/jump_label.h:200 include/trace/events/irq.h:142 kernel/softirq.c:299) + asm_call_irq_on_stack (arch/x86/entry/entry_64.S:809) + + do_softirq_own_stack (arch/x86/include/asm/irq_stack.h:27 arch/x86/include/asm/irq_stack.h:77 arch/x86/kernel/irq_64.c:77) + irq_exit_rcu (kernel/softirq.c:393 kernel/softirq.c:423 kernel/softirq.c:435) + common_interrupt (arch/x86/kernel/irq.c:239) + asm_common_interrupt (arch/x86/include/asm/idtentry.h:626) +RIP: 0010:acpi_idle_do_entry (arch/x86/include/asm/irqflags.h:49 arch/x86/include/asm/irqflags.h:89 drivers/acpi/processor_idle.c:114 drivers/acpi/processor_idle.c:575) +Code: 8b 15 d1 3c c4 02 ed c3 cc cc cc cc 65 48 8b 04 25 40 ef 01 00 48 8b 00 a8 08 75 eb 0f 1f 44 00 00 0f 00 2d d5 09 55 00 fb f4 c3 cc cc cc cc e9 be fc ff ff 66 66 2e 0f 1f 84 00 00 00 00 00 +RSP: 0018:ffffffffb5603e58 EFLAGS: 00000246 +RAX: 0000000000004000 RBX: ffff93dac0929c00 RCX: ffff93daee833900 +RDX: ffff93daee800000 RSI: ffff93daee87dc00 RDI: ffff93daee87dc64 +RBP: 0000000000000001 R08: ffffffffb5e7b6c0 R09: 0000000000000044 +R10: ffff93daee831b04 R11: 00000000000001cd R12: 0000000000000001 +R13: ffffffffb5e7b740 R14: 0000000000000001 R15: 0000000000000000 + ? sched_clock_cpu (kernel/sched/clock.c:371) + acpi_idle_enter (drivers/acpi/processor_idle.c:712 (discriminator 3)) + cpuidle_enter_state (drivers/cpuidle/cpuidle.c:237) + cpuidle_enter (drivers/cpuidle/cpuidle.c:353) + cpuidle_idle_call (kernel/sched/idle.c:158 kernel/sched/idle.c:239) + do_idle (kernel/sched/idle.c:302) + cpu_startup_entry (kernel/sched/idle.c:395 (discriminator 1)) + start_kernel (init/main.c:1048) + secondary_startup_64_no_verify (arch/x86/kernel/head_64.S:310) +Modules linked in: udp_diag tcp_diag inet_diag nft_nat ipip tunnel4 dummy fou ip_tunnel nft_masq nft_chain_nat nf_nat wireguard nft_ct curve25519_x86_64 libcurve25519_generic nf_conntrack libchacha20poly1305 nf_defrag_ipv6 nf_defrag_ipv4 nft_objref chacha_x86_64 nft_counter nf_tables nfnetlink poly1305_x86_64 ip6_udp_tunnel udp_tunnel libchacha crc32_pclmul ghash_clmulni_intel aesni_intel crypto_simd cryptd glue_helper mousedev psmouse button ena ptp pps_core crc32c_intel +CR2: 0000000000000008 + +Fixes: d92283e338f6 ("fou: change to use UDP socket GRO") +Reported-by: Alphonse Kurian +Signed-off-by: Kuniyuki Iwashima +Link: https://patch.msgid.link/20240902173927.62706-1-kuniyu@amazon.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/fou.c | 29 ++++++++++++++++++++++++----- + 1 file changed, 24 insertions(+), 5 deletions(-) + +diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c +index 605d9673d6ec..135da756dd5a 100644 +--- a/net/ipv4/fou.c ++++ b/net/ipv4/fou.c +@@ -48,7 +48,7 @@ struct fou_net { + + static inline struct fou *fou_from_sock(struct sock *sk) + { +- return sk->sk_user_data; ++ return rcu_dereference_sk_user_data(sk); + } + + static int fou_recv_pull(struct sk_buff *skb, struct fou *fou, size_t len) +@@ -231,9 +231,15 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, + struct sk_buff *skb) + { + const struct net_offload __rcu **offloads; +- u8 proto = fou_from_sock(sk)->protocol; ++ struct fou *fou = fou_from_sock(sk); + const struct net_offload *ops; + struct sk_buff *pp = NULL; ++ u8 proto; ++ ++ if (!fou) ++ goto out; ++ ++ proto = fou->protocol; + + /* We can clear the encap_mark for FOU as we are essentially doing + * one of two possible things. We are either adding an L4 tunnel +@@ -261,14 +267,24 @@ static int fou_gro_complete(struct sock *sk, struct sk_buff *skb, + int nhoff) + { + const struct net_offload __rcu **offloads; +- u8 proto = fou_from_sock(sk)->protocol; ++ struct fou *fou = fou_from_sock(sk); + const struct net_offload *ops; +- int err = -ENOSYS; ++ u8 proto; ++ int err; ++ ++ if (!fou) { ++ err = -ENOENT; ++ goto out; ++ } ++ ++ proto = fou->protocol; + + offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; + ops = rcu_dereference(offloads[proto]); +- if (WARN_ON(!ops || !ops->callbacks.gro_complete)) ++ if (WARN_ON(!ops || !ops->callbacks.gro_complete)) { ++ err = -ENOSYS; + goto out; ++ } + + err = ops->callbacks.gro_complete(skb, nhoff); + +@@ -318,6 +334,9 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, + struct gro_remcsum grc; + u8 proto; + ++ if (!fou) ++ goto out; ++ + skb_gro_remcsum_init(&grc); + + off = skb_gro_offset(skb); +-- +2.43.0 + diff --git a/queue-5.10/fou-remove-sparse-errors.patch b/queue-5.10/fou-remove-sparse-errors.patch new file mode 100644 index 00000000000..16ae7c2b702 --- /dev/null +++ b/queue-5.10/fou-remove-sparse-errors.patch @@ -0,0 +1,116 @@ +From 5d675d4b26311bfb2a058ba39a6cfd70b3aea3a4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Aug 2021 20:26:08 -0700 +Subject: fou: remove sparse errors + +From: Eric Dumazet + +[ Upstream commit 8d65cd8d25fa23951171094553901d69a88ccdff ] + +We need to add __rcu qualifier to avoid these errors: + +net/ipv4/fou.c:250:18: warning: incorrect type in assignment (different address spaces) +net/ipv4/fou.c:250:18: expected struct net_offload const **offloads +net/ipv4/fou.c:250:18: got struct net_offload const [noderef] __rcu ** +net/ipv4/fou.c:251:15: error: incompatible types in comparison expression (different address spaces): +net/ipv4/fou.c:251:15: struct net_offload const [noderef] __rcu * +net/ipv4/fou.c:251:15: struct net_offload const * +net/ipv4/fou.c:272:18: warning: incorrect type in assignment (different address spaces) +net/ipv4/fou.c:272:18: expected struct net_offload const **offloads +net/ipv4/fou.c:272:18: got struct net_offload const [noderef] __rcu ** +net/ipv4/fou.c:273:15: error: incompatible types in comparison expression (different address spaces): +net/ipv4/fou.c:273:15: struct net_offload const [noderef] __rcu * +net/ipv4/fou.c:273:15: struct net_offload const * +net/ipv4/fou.c:442:18: warning: incorrect type in assignment (different address spaces) +net/ipv4/fou.c:442:18: expected struct net_offload const **offloads +net/ipv4/fou.c:442:18: got struct net_offload const [noderef] __rcu ** +net/ipv4/fou.c:443:15: error: incompatible types in comparison expression (different address spaces): +net/ipv4/fou.c:443:15: struct net_offload const [noderef] __rcu * +net/ipv4/fou.c:443:15: struct net_offload const * +net/ipv4/fou.c:489:18: warning: incorrect type in assignment (different address spaces) +net/ipv4/fou.c:489:18: expected struct net_offload const **offloads +net/ipv4/fou.c:489:18: got struct net_offload const [noderef] __rcu ** +net/ipv4/fou.c:490:15: error: incompatible types in comparison expression (different address spaces): +net/ipv4/fou.c:490:15: struct net_offload const [noderef] __rcu * +net/ipv4/fou.c:490:15: struct net_offload const * +net/ipv4/udp_offload.c:170:26: warning: incorrect type in assignment (different address spaces) +net/ipv4/udp_offload.c:170:26: expected struct net_offload const **offloads +net/ipv4/udp_offload.c:170:26: got struct net_offload const [noderef] __rcu ** +net/ipv4/udp_offload.c:171:23: error: incompatible types in comparison expression (different address spaces): +net/ipv4/udp_offload.c:171:23: struct net_offload const [noderef] __rcu * +net/ipv4/udp_offload.c:171:23: struct net_offload const * + +Fixes: efc98d08e1ec ("fou: eliminate IPv4,v6 specific GRO functions") +Fixes: 8bce6d7d0d1e ("udp: Generalize skb_udp_segment") +Signed-off-by: Eric Dumazet +Signed-off-by: David S. Miller +Stable-dep-of: 7e4196935069 ("fou: Fix null-ptr-deref in GRO.") +Signed-off-by: Sasha Levin +--- + net/ipv4/fou.c | 10 +++++----- + net/ipv4/udp_offload.c | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c +index e5f69b0bf3df..8fcbc6258ec5 100644 +--- a/net/ipv4/fou.c ++++ b/net/ipv4/fou.c +@@ -230,8 +230,8 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, + struct list_head *head, + struct sk_buff *skb) + { ++ const struct net_offload __rcu **offloads; + u8 proto = fou_from_sock(sk)->protocol; +- const struct net_offload **offloads; + const struct net_offload *ops; + struct sk_buff *pp = NULL; + +@@ -263,10 +263,10 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, + static int fou_gro_complete(struct sock *sk, struct sk_buff *skb, + int nhoff) + { +- const struct net_offload *ops; ++ const struct net_offload __rcu **offloads; + u8 proto = fou_from_sock(sk)->protocol; ++ const struct net_offload *ops; + int err = -ENOSYS; +- const struct net_offload **offloads; + + rcu_read_lock(); + offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; +@@ -311,7 +311,7 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, + struct list_head *head, + struct sk_buff *skb) + { +- const struct net_offload **offloads; ++ const struct net_offload __rcu **offloads; + const struct net_offload *ops; + struct sk_buff *pp = NULL; + struct sk_buff *p; +@@ -457,8 +457,8 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, + + static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff) + { +- const struct net_offload **offloads; + struct guehdr *guehdr = (struct guehdr *)(skb->data + nhoff); ++ const struct net_offload __rcu **offloads; + const struct net_offload *ops; + unsigned int guehlen = 0; + u8 proto; +diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c +index a0b569d0085b..57168d4fa195 100644 +--- a/net/ipv4/udp_offload.c ++++ b/net/ipv4/udp_offload.c +@@ -149,8 +149,8 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, + netdev_features_t features, + bool is_ipv6) + { ++ const struct net_offload __rcu **offloads; + __be16 protocol = skb->protocol; +- const struct net_offload **offloads; + const struct net_offload *ops; + struct sk_buff *segs = ERR_PTR(-EINVAL); + struct sk_buff *(*gso_inner_segment)(struct sk_buff *skb, +-- +2.43.0 + diff --git a/queue-5.10/gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_co.patch b/queue-5.10/gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_co.patch new file mode 100644 index 00000000000..c8066b739d4 --- /dev/null +++ b/queue-5.10/gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_co.patch @@ -0,0 +1,222 @@ +From 076c19654c7df250f75b4e024f4870127434f561 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Nov 2021 14:56:08 -0800 +Subject: gro: remove rcu_read_lock/rcu_read_unlock from gro_complete handlers + +From: Eric Dumazet + +[ Upstream commit 627b94f75b82d13d1530b59155a545fd99d807db ] + +All gro_complete() handlers are called from napi_gro_complete() +while rcu_read_lock() has been called. + +There is no point stacking more rcu_read_lock() + +Signed-off-by: Eric Dumazet +Signed-off-by: Jakub Kicinski +Stable-dep-of: 7e4196935069 ("fou: Fix null-ptr-deref in GRO.") +Signed-off-by: Sasha Levin +--- + drivers/net/geneve.c | 3 --- + net/8021q/vlan_core.c | 2 -- + net/ethernet/eth.c | 2 -- + net/ipv4/af_inet.c | 7 ++----- + net/ipv4/fou.c | 13 ++++--------- + net/ipv4/gre_offload.c | 3 --- + net/ipv4/udp_offload.c | 2 -- + net/ipv6/ip6_offload.c | 8 ++------ + 8 files changed, 8 insertions(+), 32 deletions(-) + +diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c +index 17989688f54b..08b479f04ed0 100644 +--- a/drivers/net/geneve.c ++++ b/drivers/net/geneve.c +@@ -556,13 +556,10 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb, + gh_len = geneve_hlen(gh); + type = gh->proto_type; + +- rcu_read_lock(); + ptype = gro_find_complete_by_type(type); + if (ptype) + err = ptype->callbacks.gro_complete(skb, nhoff + gh_len); + +- rcu_read_unlock(); +- + skb_set_inner_mac_header(skb, nhoff + gh_len); + + return err; +diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c +index ff0d3fc82c0f..c96ff4a1d4a0 100644 +--- a/net/8021q/vlan_core.c ++++ b/net/8021q/vlan_core.c +@@ -516,12 +516,10 @@ static int vlan_gro_complete(struct sk_buff *skb, int nhoff) + struct packet_offload *ptype; + int err = -ENOENT; + +- rcu_read_lock(); + ptype = gro_find_complete_by_type(type); + if (ptype) + err = ptype->callbacks.gro_complete(skb, nhoff + sizeof(*vhdr)); + +- rcu_read_unlock(); + return err; + } + +diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c +index 2b0eb24199d6..081390c32707 100644 +--- a/net/ethernet/eth.c ++++ b/net/ethernet/eth.c +@@ -457,13 +457,11 @@ int eth_gro_complete(struct sk_buff *skb, int nhoff) + if (skb->encapsulation) + skb_set_inner_mac_header(skb, nhoff); + +- rcu_read_lock(); + ptype = gro_find_complete_by_type(type); + if (ptype != NULL) + err = ptype->callbacks.gro_complete(skb, nhoff + + sizeof(struct ethhdr)); + +- rcu_read_unlock(); + return err; + } + EXPORT_SYMBOL(eth_gro_complete); +diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c +index cac63bb20c16..58dfca09093c 100644 +--- a/net/ipv4/af_inet.c ++++ b/net/ipv4/af_inet.c +@@ -1634,10 +1634,9 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff) + csum_replace2(&iph->check, iph->tot_len, newlen); + iph->tot_len = newlen; + +- rcu_read_lock(); + ops = rcu_dereference(inet_offloads[proto]); + if (WARN_ON(!ops || !ops->callbacks.gro_complete)) +- goto out_unlock; ++ goto out; + + /* Only need to add sizeof(*iph) to get to the next hdr below + * because any hdr with option will have been flushed in +@@ -1647,9 +1646,7 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff) + tcp4_gro_complete, udp4_gro_complete, + skb, nhoff + sizeof(*iph)); + +-out_unlock: +- rcu_read_unlock(); +- ++out: + return err; + } + EXPORT_SYMBOL(inet_gro_complete); +diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c +index 5aacc75e495c..605d9673d6ec 100644 +--- a/net/ipv4/fou.c ++++ b/net/ipv4/fou.c +@@ -265,19 +265,16 @@ static int fou_gro_complete(struct sock *sk, struct sk_buff *skb, + const struct net_offload *ops; + int err = -ENOSYS; + +- rcu_read_lock(); + offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; + ops = rcu_dereference(offloads[proto]); + if (WARN_ON(!ops || !ops->callbacks.gro_complete)) +- goto out_unlock; ++ goto out; + + err = ops->callbacks.gro_complete(skb, nhoff); + + skb_set_inner_mac_header(skb, nhoff); + +-out_unlock: +- rcu_read_unlock(); +- ++out: + return err; + } + +@@ -479,18 +476,16 @@ static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff) + return err; + } + +- rcu_read_lock(); + offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; + ops = rcu_dereference(offloads[proto]); + if (WARN_ON(!ops || !ops->callbacks.gro_complete)) +- goto out_unlock; ++ goto out; + + err = ops->callbacks.gro_complete(skb, nhoff + guehlen); + + skb_set_inner_mac_header(skb, nhoff + guehlen); + +-out_unlock: +- rcu_read_unlock(); ++out: + return err; + } + +diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c +index e9dabf1affe9..b4da692b9734 100644 +--- a/net/ipv4/gre_offload.c ++++ b/net/ipv4/gre_offload.c +@@ -248,13 +248,10 @@ static int gre_gro_complete(struct sk_buff *skb, int nhoff) + if (greh->flags & GRE_CSUM) + grehlen += GRE_HEADER_SECTION; + +- rcu_read_lock(); + ptype = gro_find_complete_by_type(type); + if (ptype) + err = ptype->callbacks.gro_complete(skb, nhoff + grehlen); + +- rcu_read_unlock(); +- + skb_set_inner_mac_header(skb, nhoff + grehlen); + + return err; +diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c +index 418da7a8a075..6e36eb1ba276 100644 +--- a/net/ipv4/udp_offload.c ++++ b/net/ipv4/udp_offload.c +@@ -645,7 +645,6 @@ int udp_gro_complete(struct sk_buff *skb, int nhoff, + + uh->len = newlen; + +- rcu_read_lock(); + sk = INDIRECT_CALL_INET(lookup, udp6_lib_lookup_skb, + udp4_lib_lookup_skb, skb, uh->source, uh->dest); + if (sk && udp_sk(sk)->gro_complete) { +@@ -661,7 +660,6 @@ int udp_gro_complete(struct sk_buff *skb, int nhoff, + } else { + err = udp_gro_complete_segment(skb); + } +- rcu_read_unlock(); + + if (skb->remcsum_offload) + skb_shinfo(skb)->gso_type |= SKB_GSO_TUNNEL_REMCSUM; +diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c +index f67921e0dd56..673f02ea62aa 100644 +--- a/net/ipv6/ip6_offload.c ++++ b/net/ipv6/ip6_offload.c +@@ -328,18 +328,14 @@ INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) + + iph->payload_len = htons(skb->len - nhoff - sizeof(*iph)); + +- rcu_read_lock(); +- + nhoff += sizeof(*iph) + ipv6_exthdrs_len(iph, &ops); + if (WARN_ON(!ops || !ops->callbacks.gro_complete)) +- goto out_unlock; ++ goto out; + + err = INDIRECT_CALL_L4(ops->callbacks.gro_complete, tcp6_gro_complete, + udp6_gro_complete, skb, nhoff); + +-out_unlock: +- rcu_read_unlock(); +- ++out: + return err; + } + +-- +2.43.0 + diff --git a/queue-5.10/gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_re.patch b/queue-5.10/gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_re.patch new file mode 100644 index 00000000000..ca39172b86d --- /dev/null +++ b/queue-5.10/gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_re.patch @@ -0,0 +1,296 @@ +From c739ec8b899f64b70e09f9a5f6707406f9f941fd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Nov 2021 14:56:07 -0800 +Subject: gro: remove rcu_read_lock/rcu_read_unlock from gro_receive handlers + +From: Eric Dumazet + +[ Upstream commit fc1ca3348a74a1afaa7ffebc2b2f2cc149e11278 ] + +All gro_receive() handlers are called from dev_gro_receive() +while rcu_read_lock() has been called. + +There is no point stacking more rcu_read_lock() + +Signed-off-by: Eric Dumazet +Signed-off-by: Jakub Kicinski +Stable-dep-of: 7e4196935069 ("fou: Fix null-ptr-deref in GRO.") +Signed-off-by: Sasha Levin +--- + drivers/net/geneve.c | 5 +---- + net/8021q/vlan_core.c | 5 +---- + net/ethernet/eth.c | 5 +---- + net/ipv4/af_inet.c | 12 ++++-------- + net/ipv4/fou.c | 12 +++--------- + net/ipv4/gre_offload.c | 9 +++------ + net/ipv4/udp_offload.c | 2 -- + net/ipv6/ip6_offload.c | 6 +----- + net/ipv6/udp_offload.c | 2 -- + 9 files changed, 14 insertions(+), 44 deletions(-) + +diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c +index af35361a3dce..17989688f54b 100644 +--- a/drivers/net/geneve.c ++++ b/drivers/net/geneve.c +@@ -528,18 +528,15 @@ static struct sk_buff *geneve_gro_receive(struct sock *sk, + + type = gh->proto_type; + +- rcu_read_lock(); + ptype = gro_find_receive_by_type(type); + if (!ptype) +- goto out_unlock; ++ goto out; + + skb_gro_pull(skb, gh_len); + skb_gro_postpull_rcsum(skb, gh, gh_len); + pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb); + flush = 0; + +-out_unlock: +- rcu_read_unlock(); + out: + skb_gro_flush_final(skb, pp, flush); + +diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c +index 43aea97c5762..ff0d3fc82c0f 100644 +--- a/net/8021q/vlan_core.c ++++ b/net/8021q/vlan_core.c +@@ -482,10 +482,9 @@ static struct sk_buff *vlan_gro_receive(struct list_head *head, + + type = vhdr->h_vlan_encapsulated_proto; + +- rcu_read_lock(); + ptype = gro_find_receive_by_type(type); + if (!ptype) +- goto out_unlock; ++ goto out; + + flush = 0; + +@@ -504,8 +503,6 @@ static struct sk_buff *vlan_gro_receive(struct list_head *head, + skb_gro_postpull_rcsum(skb, vhdr, sizeof(*vhdr)); + pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb); + +-out_unlock: +- rcu_read_unlock(); + out: + skb_gro_flush_final(skb, pp, flush); + +diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c +index 61cb40368723..2b0eb24199d6 100644 +--- a/net/ethernet/eth.c ++++ b/net/ethernet/eth.c +@@ -430,19 +430,16 @@ struct sk_buff *eth_gro_receive(struct list_head *head, struct sk_buff *skb) + + type = eh->h_proto; + +- rcu_read_lock(); + ptype = gro_find_receive_by_type(type); + if (ptype == NULL) { + flush = 1; +- goto out_unlock; ++ goto out; + } + + skb_gro_pull(skb, sizeof(*eh)); + skb_gro_postpull_rcsum(skb, eh, sizeof(*eh)); + pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb); + +-out_unlock: +- rcu_read_unlock(); + out: + skb_gro_flush_final(skb, pp, flush); + +diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c +index ce42626663de..cac63bb20c16 100644 +--- a/net/ipv4/af_inet.c ++++ b/net/ipv4/af_inet.c +@@ -1471,19 +1471,18 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb) + + proto = iph->protocol; + +- rcu_read_lock(); + ops = rcu_dereference(inet_offloads[proto]); + if (!ops || !ops->callbacks.gro_receive) +- goto out_unlock; ++ goto out; + + if (*(u8 *)iph != 0x45) +- goto out_unlock; ++ goto out; + + if (ip_is_fragment(iph)) +- goto out_unlock; ++ goto out; + + if (unlikely(ip_fast_csum((u8 *)iph, 5))) +- goto out_unlock; ++ goto out; + + id = ntohl(*(__be32 *)&iph->id); + flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id & ~IP_DF)); +@@ -1560,9 +1559,6 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb) + pp = indirect_call_gro_receive(tcp4_gro_receive, udp4_gro_receive, + ops->callbacks.gro_receive, head, skb); + +-out_unlock: +- rcu_read_unlock(); +- + out: + skb_gro_flush_final(skb, pp, flush); + +diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c +index 8fcbc6258ec5..5aacc75e495c 100644 +--- a/net/ipv4/fou.c ++++ b/net/ipv4/fou.c +@@ -246,17 +246,14 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, + /* Flag this frame as already having an outer encap header */ + NAPI_GRO_CB(skb)->is_fou = 1; + +- rcu_read_lock(); + offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; + ops = rcu_dereference(offloads[proto]); + if (!ops || !ops->callbacks.gro_receive) +- goto out_unlock; ++ goto out; + + pp = call_gro_receive(ops->callbacks.gro_receive, head, skb); + +-out_unlock: +- rcu_read_unlock(); +- ++out: + return pp; + } + +@@ -438,17 +435,14 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, + /* Flag this frame as already having an outer encap header */ + NAPI_GRO_CB(skb)->is_fou = 1; + +- rcu_read_lock(); + offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads; + ops = rcu_dereference(offloads[proto]); + if (WARN_ON_ONCE(!ops || !ops->callbacks.gro_receive)) +- goto out_unlock; ++ goto out; + + pp = call_gro_receive(ops->callbacks.gro_receive, head, skb); + flush = 0; + +-out_unlock: +- rcu_read_unlock(); + out: + skb_gro_flush_final_remcsum(skb, pp, flush, &grc); + +diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c +index e0a246575887..e9dabf1affe9 100644 +--- a/net/ipv4/gre_offload.c ++++ b/net/ipv4/gre_offload.c +@@ -158,10 +158,9 @@ static struct sk_buff *gre_gro_receive(struct list_head *head, + + type = greh->protocol; + +- rcu_read_lock(); + ptype = gro_find_receive_by_type(type); + if (!ptype) +- goto out_unlock; ++ goto out; + + grehlen = GRE_HEADER_SECTION; + +@@ -175,13 +174,13 @@ static struct sk_buff *gre_gro_receive(struct list_head *head, + if (skb_gro_header_hard(skb, hlen)) { + greh = skb_gro_header_slow(skb, hlen, off); + if (unlikely(!greh)) +- goto out_unlock; ++ goto out; + } + + /* Don't bother verifying checksum if we're going to flush anyway. */ + if ((greh->flags & GRE_CSUM) && !NAPI_GRO_CB(skb)->flush) { + if (skb_gro_checksum_simple_validate(skb)) +- goto out_unlock; ++ goto out; + + skb_gro_checksum_try_convert(skb, IPPROTO_GRE, + null_compute_pseudo); +@@ -225,8 +224,6 @@ static struct sk_buff *gre_gro_receive(struct list_head *head, + pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb); + flush = 0; + +-out_unlock: +- rcu_read_unlock(); + out: + skb_gro_flush_final(skb, pp, flush); + +diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c +index 57168d4fa195..418da7a8a075 100644 +--- a/net/ipv4/udp_offload.c ++++ b/net/ipv4/udp_offload.c +@@ -606,13 +606,11 @@ struct sk_buff *udp4_gro_receive(struct list_head *head, struct sk_buff *skb) + inet_gro_compute_pseudo); + skip: + NAPI_GRO_CB(skb)->is_ipv6 = 0; +- rcu_read_lock(); + + if (static_branch_unlikely(&udp_encap_needed_key)) + sk = udp4_gro_lookup_skb(skb, uh->source, uh->dest); + + pp = udp_gro_receive(head, skb, uh, sk); +- rcu_read_unlock(); + return pp; + + flush: +diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c +index 15c8eef1ef44..f67921e0dd56 100644 +--- a/net/ipv6/ip6_offload.c ++++ b/net/ipv6/ip6_offload.c +@@ -209,7 +209,6 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, + + flush += ntohs(iph->payload_len) != skb_gro_len(skb); + +- rcu_read_lock(); + proto = iph->nexthdr; + ops = rcu_dereference(inet6_offloads[proto]); + if (!ops || !ops->callbacks.gro_receive) { +@@ -222,7 +221,7 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, + + ops = rcu_dereference(inet6_offloads[proto]); + if (!ops || !ops->callbacks.gro_receive) +- goto out_unlock; ++ goto out; + + iph = ipv6_hdr(skb); + } +@@ -280,9 +279,6 @@ INDIRECT_CALLABLE_SCOPE struct sk_buff *ipv6_gro_receive(struct list_head *head, + pp = indirect_call_gro_receive_l4(tcp6_gro_receive, udp6_gro_receive, + ops->callbacks.gro_receive, head, skb); + +-out_unlock: +- rcu_read_unlock(); +- + out: + skb_gro_flush_final(skb, pp, flush); + +diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c +index 7752e1e921f8..1107782c083d 100644 +--- a/net/ipv6/udp_offload.c ++++ b/net/ipv6/udp_offload.c +@@ -144,13 +144,11 @@ struct sk_buff *udp6_gro_receive(struct list_head *head, struct sk_buff *skb) + + skip: + NAPI_GRO_CB(skb)->is_ipv6 = 1; +- rcu_read_lock(); + + if (static_branch_unlikely(&udpv6_encap_needed_key)) + sk = udp6_gro_lookup_skb(skb, uh->source, uh->dest); + + pp = udp_gro_receive(head, skb, uh, sk); +- rcu_read_unlock(); + return pp; + + flush: +-- +2.43.0 + diff --git a/queue-5.10/hid-cougar-fix-slab-out-of-bounds-read-in-cougar_rep.patch b/queue-5.10/hid-cougar-fix-slab-out-of-bounds-read-in-cougar_rep.patch new file mode 100644 index 00000000000..69c6c083f38 --- /dev/null +++ b/queue-5.10/hid-cougar-fix-slab-out-of-bounds-read-in-cougar_rep.patch @@ -0,0 +1,38 @@ +From 86f05d807696cbd1cade4fbbca105a583532e3b8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Jul 2024 19:42:43 -0400 +Subject: HID: cougar: fix slab-out-of-bounds Read in cougar_report_fixup + +From: Camila Alvarez + +[ Upstream commit a6e9c391d45b5865b61e569146304cff72821a5d ] + +report_fixup for the Cougar 500k Gaming Keyboard was not verifying +that the report descriptor size was correct before accessing it + +Reported-by: syzbot+24c0361074799d02c452@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=24c0361074799d02c452 +Signed-off-by: Camila Alvarez +Reviewed-by: Silvan Jegen +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-cougar.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c +index 28d671c5e0ca..d173b13ff198 100644 +--- a/drivers/hid/hid-cougar.c ++++ b/drivers/hid/hid-cougar.c +@@ -106,7 +106,7 @@ static void cougar_fix_g6_mapping(void) + static __u8 *cougar_report_fixup(struct hid_device *hdev, __u8 *rdesc, + unsigned int *rsize) + { +- if (rdesc[2] == 0x09 && rdesc[3] == 0x02 && ++ if (*rsize >= 117 && rdesc[2] == 0x09 && rdesc[3] == 0x02 && + (rdesc[115] | rdesc[116] << 8) >= HID_MAX_USAGES) { + hid_info(hdev, + "usage count exceeds max: fixing up report descriptor\n"); +-- +2.43.0 + diff --git a/queue-5.10/hwmon-adc128d818-fix-underflows-seen-when-writing-li.patch b/queue-5.10/hwmon-adc128d818-fix-underflows-seen-when-writing-li.patch new file mode 100644 index 00000000000..d1e25bb1b40 --- /dev/null +++ b/queue-5.10/hwmon-adc128d818-fix-underflows-seen-when-writing-li.patch @@ -0,0 +1,44 @@ +From 2e70912b72f01ab9950bbff193dc0880292be3cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Jul 2024 23:43:04 -0700 +Subject: hwmon: (adc128d818) Fix underflows seen when writing limit attributes + +From: Guenter Roeck + +[ Upstream commit 8cad724c8537fe3e0da8004646abc00290adae40 ] + +DIV_ROUND_CLOSEST() after kstrtol() results in an underflow if a large +negative number such as -9223372036854775808 is provided by the user. +Fix it by reordering clamp_val() and DIV_ROUND_CLOSEST() operations. + +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/adc128d818.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwmon/adc128d818.c b/drivers/hwmon/adc128d818.c +index 6c9a906631b8..e73c4de9471f 100644 +--- a/drivers/hwmon/adc128d818.c ++++ b/drivers/hwmon/adc128d818.c +@@ -176,7 +176,7 @@ static ssize_t adc128_in_store(struct device *dev, + + mutex_lock(&data->update_lock); + /* 10 mV LSB on limit registers */ +- regval = clamp_val(DIV_ROUND_CLOSEST(val, 10), 0, 255); ++ regval = DIV_ROUND_CLOSEST(clamp_val(val, 0, 2550), 10); + data->in[index][nr] = regval << 4; + reg = index == 1 ? ADC128_REG_IN_MIN(nr) : ADC128_REG_IN_MAX(nr); + i2c_smbus_write_byte_data(data->client, reg, regval); +@@ -214,7 +214,7 @@ static ssize_t adc128_temp_store(struct device *dev, + return err; + + mutex_lock(&data->update_lock); +- regval = clamp_val(DIV_ROUND_CLOSEST(val, 1000), -128, 127); ++ regval = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000); + data->temp[index] = regval << 1; + i2c_smbus_write_byte_data(data->client, + index == 1 ? ADC128_REG_TEMP_MAX +-- +2.43.0 + diff --git a/queue-5.10/hwmon-lm95234-fix-underflows-seen-when-writing-limit.patch b/queue-5.10/hwmon-lm95234-fix-underflows-seen-when-writing-limit.patch new file mode 100644 index 00000000000..a40e051cc6e --- /dev/null +++ b/queue-5.10/hwmon-lm95234-fix-underflows-seen-when-writing-limit.patch @@ -0,0 +1,63 @@ +From 3c926e3a521f3adf3ed4fde3242f8cca5c128afd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Jul 2024 23:48:42 -0700 +Subject: hwmon: (lm95234) Fix underflows seen when writing limit attributes + +From: Guenter Roeck + +[ Upstream commit af64e3e1537896337405f880c1e9ac1f8c0c6198 ] + +DIV_ROUND_CLOSEST() after kstrtol() results in an underflow if a large +negative number such as -9223372036854775808 is provided by the user. +Fix it by reordering clamp_val() and DIV_ROUND_CLOSEST() operations. + +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/lm95234.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/hwmon/lm95234.c b/drivers/hwmon/lm95234.c +index ac169a994ae0..db2aecdfbd17 100644 +--- a/drivers/hwmon/lm95234.c ++++ b/drivers/hwmon/lm95234.c +@@ -301,7 +301,8 @@ static ssize_t tcrit2_store(struct device *dev, struct device_attribute *attr, + if (ret < 0) + return ret; + +- val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, index ? 255 : 127); ++ val = DIV_ROUND_CLOSEST(clamp_val(val, 0, (index ? 255 : 127) * 1000), ++ 1000); + + mutex_lock(&data->update_lock); + data->tcrit2[index] = val; +@@ -350,7 +351,7 @@ static ssize_t tcrit1_store(struct device *dev, struct device_attribute *attr, + if (ret < 0) + return ret; + +- val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, 255); ++ val = DIV_ROUND_CLOSEST(clamp_val(val, 0, 255000), 1000); + + mutex_lock(&data->update_lock); + data->tcrit1[index] = val; +@@ -391,7 +392,7 @@ static ssize_t tcrit1_hyst_store(struct device *dev, + if (ret < 0) + return ret; + +- val = DIV_ROUND_CLOSEST(val, 1000); ++ val = DIV_ROUND_CLOSEST(clamp_val(val, -255000, 255000), 1000); + val = clamp_val((int)data->tcrit1[index] - val, 0, 31); + + mutex_lock(&data->update_lock); +@@ -431,7 +432,7 @@ static ssize_t offset_store(struct device *dev, struct device_attribute *attr, + return ret; + + /* Accuracy is 1/2 degrees C */ +- val = clamp_val(DIV_ROUND_CLOSEST(val, 500), -128, 127); ++ val = DIV_ROUND_CLOSEST(clamp_val(val, -64000, 63500), 500); + + mutex_lock(&data->update_lock); + data->toffset[index] = val; +-- +2.43.0 + diff --git a/queue-5.10/hwmon-nct6775-core-fix-underflows-seen-when-writing-.patch b/queue-5.10/hwmon-nct6775-core-fix-underflows-seen-when-writing-.patch new file mode 100644 index 00000000000..ed3ae77e21f --- /dev/null +++ b/queue-5.10/hwmon-nct6775-core-fix-underflows-seen-when-writing-.patch @@ -0,0 +1,36 @@ +From 52818a94a5cd83326e7a3bf81ecbbaa511f0c467 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Jul 2024 23:50:08 -0700 +Subject: hwmon: (nct6775-core) Fix underflows seen when writing limit + attributes + +From: Guenter Roeck + +[ Upstream commit 0403e10bf0824bf0ec2bb135d4cf1c0cc3bf4bf0 ] + +DIV_ROUND_CLOSEST() after kstrtol() results in an underflow if a large +negative number such as -9223372036854775808 is provided by the user. +Fix it by reordering clamp_val() and DIV_ROUND_CLOSEST() operations. + +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/nct6775.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c +index 5bd15622a85f..3645a19cdaf4 100644 +--- a/drivers/hwmon/nct6775.c ++++ b/drivers/hwmon/nct6775.c +@@ -2374,7 +2374,7 @@ store_temp_offset(struct device *dev, struct device_attribute *attr, + if (err < 0) + return err; + +- val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), -128, 127); ++ val = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000); + + mutex_lock(&data->update_lock); + data->temp_offset[nr] = val; +-- +2.43.0 + diff --git a/queue-5.10/hwmon-w83627ehf-fix-underflows-seen-when-writing-lim.patch b/queue-5.10/hwmon-w83627ehf-fix-underflows-seen-when-writing-lim.patch new file mode 100644 index 00000000000..9f5b44996d4 --- /dev/null +++ b/queue-5.10/hwmon-w83627ehf-fix-underflows-seen-when-writing-lim.patch @@ -0,0 +1,44 @@ +From 6c030224b721da21618eafa02a46e3e8f80837fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Jul 2024 23:51:34 -0700 +Subject: hwmon: (w83627ehf) Fix underflows seen when writing limit attributes + +From: Guenter Roeck + +[ Upstream commit 5c1de37969b7bc0abcb20b86e91e70caebbd4f89 ] + +DIV_ROUND_CLOSEST() after kstrtol() results in an underflow if a large +negative number such as -9223372036854775808 is provided by the user. +Fix it by reordering clamp_val() and DIV_ROUND_CLOSEST() operations. + +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/w83627ehf.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c +index 3964ceab2817..acf36862851a 100644 +--- a/drivers/hwmon/w83627ehf.c ++++ b/drivers/hwmon/w83627ehf.c +@@ -897,7 +897,7 @@ store_target_temp(struct device *dev, struct device_attribute *attr, + if (err < 0) + return err; + +- val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, 127); ++ val = DIV_ROUND_CLOSEST(clamp_val(val, 0, 127000), 1000); + + mutex_lock(&data->update_lock); + data->target_temp[nr] = val; +@@ -922,7 +922,7 @@ store_tolerance(struct device *dev, struct device_attribute *attr, + return err; + + /* Limit the temp to 0C - 15C */ +- val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, 15); ++ val = DIV_ROUND_CLOSEST(clamp_val(val, 0, 15000), 1000); + + mutex_lock(&data->update_lock); + reg = w83627ehf_read_value(data, W83627EHF_REG_TOLERANCE[nr]); +-- +2.43.0 + diff --git a/queue-5.10/igb-fix-not-clearing-timesync-interrupts-for-82580.patch b/queue-5.10/igb-fix-not-clearing-timesync-interrupts-for-82580.patch new file mode 100644 index 00000000000..6e351cef978 --- /dev/null +++ b/queue-5.10/igb-fix-not-clearing-timesync-interrupts-for-82580.patch @@ -0,0 +1,70 @@ +From 695e0450ac54eb14dd63b0f5ade7743c5e0cc6ae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 13 Aug 2024 21:55:53 -0700 +Subject: igb: Fix not clearing TimeSync interrupts for 82580 + +From: Daiwei Li + +[ Upstream commit ba8cf80724dbc09825b52498e4efacb563935408 ] + +82580 NICs have a hardware bug that makes it +necessary to write into the TSICR (TimeSync Interrupt Cause) register +to clear it: +https://lore.kernel.org/all/CDCB8BE0.1EC2C%25matthew.vick@intel.com/ + +Add a conditional so only for 82580 we write into the TSICR register, +so we don't risk losing events for other models. + +Without this change, when running ptp4l with an Intel 82580 card, +I get the following output: + +> timed out while polling for tx timestamp increasing tx_timestamp_timeout or +> increasing kworker priority may correct this issue, but a driver bug likely +> causes it + +This goes away with this change. + +This (partially) reverts commit ee14cc9ea19b ("igb: Fix missing time sync events"). + +Fixes: ee14cc9ea19b ("igb: Fix missing time sync events") +Closes: https://lore.kernel.org/intel-wired-lan/CAN0jFd1kO0MMtOh8N2Ztxn6f7vvDKp2h507sMryobkBKe=xk=w@mail.gmail.com/ +Tested-by: Daiwei Li +Suggested-by: Vinicius Costa Gomes +Signed-off-by: Daiwei Li +Acked-by: Vinicius Costa Gomes +Reviewed-by: Kurt Kanzenbach +Tested-by: Pucha Himasekhar Reddy (A Contingent worker at Intel) +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/igb/igb_main.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index 0848613c3f45..e2c38e5232dc 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -6805,10 +6805,20 @@ static void igb_extts(struct igb_adapter *adapter, int tsintr_tt) + + static void igb_tsync_interrupt(struct igb_adapter *adapter) + { ++ const u32 mask = (TSINTR_SYS_WRAP | E1000_TSICR_TXTS | ++ TSINTR_TT0 | TSINTR_TT1 | ++ TSINTR_AUTT0 | TSINTR_AUTT1); + struct e1000_hw *hw = &adapter->hw; + u32 tsicr = rd32(E1000_TSICR); + struct ptp_clock_event event; + ++ if (hw->mac.type == e1000_82580) { ++ /* 82580 has a hardware bug that requires an explicit ++ * write to clear the TimeSync interrupt cause. ++ */ ++ wr32(E1000_TSICR, tsicr & mask); ++ } ++ + if (tsicr & TSINTR_SYS_WRAP) { + event.type = PTP_CLOCK_PPS; + if (adapter->ptp_caps.pps) +-- +2.43.0 + diff --git a/queue-5.10/igc-unlock-on-error-in-igc_io_resume.patch b/queue-5.10/igc-unlock-on-error-in-igc_io_resume.patch new file mode 100644 index 00000000000..6729a81c770 --- /dev/null +++ b/queue-5.10/igc-unlock-on-error-in-igc_io_resume.patch @@ -0,0 +1,35 @@ +From 5467a82192fbeea7288e094e9a0276b643d148d3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 Aug 2024 22:22:45 +0300 +Subject: igc: Unlock on error in igc_io_resume() + +From: Dan Carpenter + +[ Upstream commit ef4a99a0164e3972abb421cbb1b09ea6c61414df ] + +Call rtnl_unlock() on this error path, before returning. + +Fixes: bc23aa949aeb ("igc: Add pcie error handler support") +Signed-off-by: Dan Carpenter +Reviewed-by: Gerhard Engleder +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/igc/igc_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c +index 631ce793fb2e..65cf7035b02d 100644 +--- a/drivers/net/ethernet/intel/igc/igc_main.c ++++ b/drivers/net/ethernet/intel/igc/igc_main.c +@@ -5740,6 +5740,7 @@ static void igc_io_resume(struct pci_dev *pdev) + rtnl_lock(); + if (netif_running(netdev)) { + if (igc_open(netdev)) { ++ rtnl_unlock(); + netdev_err(netdev, "igc_open failed after reset\n"); + return; + } +-- +2.43.0 + diff --git a/queue-5.10/input-uinput-reject-requests-with-unreasonable-numbe.patch b/queue-5.10/input-uinput-reject-requests-with-unreasonable-numbe.patch new file mode 100644 index 00000000000..8bb7ee5e39f --- /dev/null +++ b/queue-5.10/input-uinput-reject-requests-with-unreasonable-numbe.patch @@ -0,0 +1,59 @@ +From cd9223479190562c850c15f975ce8434c4462b38 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 4 Aug 2024 17:50:25 -0700 +Subject: Input: uinput - reject requests with unreasonable number of slots + +From: Dmitry Torokhov + +[ Upstream commit 206f533a0a7c683982af473079c4111f4a0f9f5e ] + +From: Dmitry Torokhov + +When exercising uinput interface syzkaller may try setting up device +with a really large number of slots, which causes memory allocation +failure in input_mt_init_slots(). While this allocation failure is +handled properly and request is rejected, it results in syzkaller +reports. Additionally, such request may put undue burden on the +system which will try to free a lot of memory for a bogus request. + +Fix it by limiting allowed number of slots to 100. This can easily +be extended if we see devices that can track more than 100 contacts. + +Reported-by: Tetsuo Handa +Reported-by: syzbot +Closes: https://syzkaller.appspot.com/bug?extid=0122fa359a69694395d5 +Link: https://lore.kernel.org/r/Zqgi7NYEbpRsJfa2@google.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/misc/uinput.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c +index f2593133e524..790db3ceb208 100644 +--- a/drivers/input/misc/uinput.c ++++ b/drivers/input/misc/uinput.c +@@ -416,6 +416,20 @@ static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code, + return -EINVAL; + } + ++ /* ++ * Limit number of contacts to a reasonable value (100). This ++ * ensures that we need less than 2 pages for struct input_mt ++ * (we are not using in-kernel slot assignment so not going to ++ * allocate memory for the "red" table), and we should have no ++ * trouble getting this much memory. ++ */ ++ if (code == ABS_MT_SLOT && max > 99) { ++ printk(KERN_DEBUG ++ "%s: unreasonably large number of slots requested: %d\n", ++ UINPUT_NAME, max); ++ return -EINVAL; ++ } ++ + return 0; + } + +-- +2.43.0 + diff --git a/queue-5.10/iommu-sun50i-clear-bypass-register.patch b/queue-5.10/iommu-sun50i-clear-bypass-register.patch new file mode 100644 index 00000000000..fed9e9ca017 --- /dev/null +++ b/queue-5.10/iommu-sun50i-clear-bypass-register.patch @@ -0,0 +1,43 @@ +From 0199ee09e908149fca3dfacd323716feda90de6c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Jun 2024 23:40:52 +0100 +Subject: iommu: sun50i: clear bypass register + +From: Jernej Skrabec + +[ Upstream commit 927c70c93d929f4c2dcaf72f51b31bb7d118a51a ] + +The Allwinner H6 IOMMU has a bypass register, which allows to circumvent +the page tables for each possible master. The reset value for this +register is 0, which disables the bypass. +The Allwinner H616 IOMMU resets this register to 0x7f, which activates +the bypass for all masters, which is not what we want. + +Always clear this register to 0, to enforce the usage of page tables, +and make this driver compatible with the H616 in this respect. + +Signed-off-by: Jernej Skrabec +Signed-off-by: Andre Przywara +Reviewed-by: Chen-Yu Tsai +Link: https://lore.kernel.org/r/20240616224056.29159-2-andre.przywara@arm.com +Signed-off-by: Joerg Roedel +Signed-off-by: Sasha Levin +--- + drivers/iommu/sun50i-iommu.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c +index 65aa30d55d3a..f31f66b12366 100644 +--- a/drivers/iommu/sun50i-iommu.c ++++ b/drivers/iommu/sun50i-iommu.c +@@ -380,6 +380,7 @@ static int sun50i_iommu_enable(struct sun50i_iommu *iommu) + IOMMU_TLB_PREFETCH_MASTER_ENABLE(3) | + IOMMU_TLB_PREFETCH_MASTER_ENABLE(4) | + IOMMU_TLB_PREFETCH_MASTER_ENABLE(5)); ++ iommu_write(iommu, IOMMU_BYPASS_REG, 0); + iommu_write(iommu, IOMMU_INT_ENABLE_REG, IOMMU_INT_MASK); + iommu_write(iommu, IOMMU_DM_AUT_CTRL_REG(SUN50I_IOMMU_ACI_NONE), + IOMMU_DM_AUT_CTRL_RD_UNAVAIL(SUN50I_IOMMU_ACI_NONE, 0) | +-- +2.43.0 + diff --git a/queue-5.10/iommu-vt-d-handle-volatile-descriptor-status-read.patch b/queue-5.10/iommu-vt-d-handle-volatile-descriptor-status-read.patch new file mode 100644 index 00000000000..b48dcaea2dd --- /dev/null +++ b/queue-5.10/iommu-vt-d-handle-volatile-descriptor-status-read.patch @@ -0,0 +1,56 @@ +From 2f97fd1a0e1a1d9b0cf784e087989a2ff0f5dd50 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Jul 2024 21:08:33 +0800 +Subject: iommu/vt-d: Handle volatile descriptor status read + +From: Jacob Pan + +[ Upstream commit b5e86a95541cea737394a1da967df4cd4d8f7182 ] + +Queued invalidation wait descriptor status is volatile in that IOMMU +hardware writes the data upon completion. + +Use READ_ONCE() to prevent compiler optimizations which ensures memory +reads every time. As a side effect, READ_ONCE() also enforces strict +types and may add an extra instruction. But it should not have negative +performance impact since we use cpu_relax anyway and the extra time(by +adding an instruction) may allow IOMMU HW request cacheline ownership +easier. + +e.g. gcc 12.3 +BEFORE: + 81 38 ad de 00 00 cmpl $0x2,(%rax) + +AFTER (with READ_ONCE()) + 772f: 8b 00 mov (%rax),%eax + 7731: 3d ad de 00 00 cmp $0x2,%eax + //status data is 32 bit + +Signed-off-by: Jacob Pan +Reviewed-by: Kevin Tian +Reviewed-by: Yi Liu +Link: https://lore.kernel.org/r/20240607173817.3914600-1-jacob.jun.pan@linux.intel.com +Signed-off-by: Lu Baolu +Link: https://lore.kernel.org/r/20240702130839.108139-2-baolu.lu@linux.intel.com +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + drivers/iommu/intel/dmar.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c +index a27765a7f6b7..72b380e17a1b 100644 +--- a/drivers/iommu/intel/dmar.c ++++ b/drivers/iommu/intel/dmar.c +@@ -1333,7 +1333,7 @@ int qi_submit_sync(struct intel_iommu *iommu, struct qi_desc *desc, + */ + writel(qi->free_head << shift, iommu->reg + DMAR_IQT_REG); + +- while (qi->desc_status[wait_index] != QI_DONE) { ++ while (READ_ONCE(qi->desc_status[wait_index]) != QI_DONE) { + /* + * We will leave the interrupts disabled, to prevent interrupt + * context to queue another cmd while a cmd is already submitted +-- +2.43.0 + diff --git a/queue-5.10/irqchip-armada-370-xp-do-not-allow-mapping-irq-0-and.patch b/queue-5.10/irqchip-armada-370-xp-do-not-allow-mapping-irq-0-and.patch new file mode 100644 index 00000000000..bb3b90a2d94 --- /dev/null +++ b/queue-5.10/irqchip-armada-370-xp-do-not-allow-mapping-irq-0-and.patch @@ -0,0 +1,46 @@ +From 627d3f2794a259b3b9b0ac36ec731ea7589eef00 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Jun 2024 11:38:28 +0200 +Subject: irqchip/armada-370-xp: Do not allow mapping IRQ 0 and 1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár + +[ Upstream commit 3cef738208e5c3cb7084e208caf9bbf684f24feb ] + +IRQs 0 (IPI) and 1 (MSI) are handled internally by this driver, +generic_handle_domain_irq() is never called for these IRQs. + +Disallow mapping these IRQs. + +[ Marek: changed commit message ] + +Signed-off-by: Pali Rohár +Signed-off-by: Marek Behún +Signed-off-by: Thomas Gleixner +Reviewed-by: Andrew Lunn +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-armada-370-xp.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c +index c76fb70c70bb..e865a43428b8 100644 +--- a/drivers/irqchip/irq-armada-370-xp.c ++++ b/drivers/irqchip/irq-armada-370-xp.c +@@ -546,6 +546,10 @@ static struct irq_chip armada_370_xp_irq_chip = { + static int armada_370_xp_mpic_irq_map(struct irq_domain *h, + unsigned int virq, irq_hw_number_t hw) + { ++ /* IRQs 0 and 1 cannot be mapped, they are handled internally */ ++ if (hw <= 1) ++ return -EINVAL; ++ + armada_370_xp_irq_mask(irq_get_irq_data(virq)); + if (!is_percpu_irq(hw)) + writel(hw, per_cpu_int_base + +-- +2.43.0 + diff --git a/queue-5.10/irqchip-gic-v4-always-configure-affinity-on-vpe-acti.patch b/queue-5.10/irqchip-gic-v4-always-configure-affinity-on-vpe-acti.patch new file mode 100644 index 00000000000..4858683aaf7 --- /dev/null +++ b/queue-5.10/irqchip-gic-v4-always-configure-affinity-on-vpe-acti.patch @@ -0,0 +1,83 @@ +From 8074f0b4bfda80c2cbf87ef1106a1e5fe4d10109 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Jul 2024 10:31:53 +0100 +Subject: irqchip/gic-v4: Always configure affinity on VPE activation + +From: Marc Zyngier + +[ Upstream commit 7d2c2048a86477461f7bc75d064579ed349472bc ] + +There are currently two paths to set the initial affinity of a VPE: + + - at activation time on GICv4 without the stupid VMOVP list, and + on GICv4.1 + + - at map time for GICv4 with VMOVP list + +The latter location may end-up modifying the affinity of VPE that is +currently running, making the results unpredictible. + +Instead, unify the two paths, making sure to set the initial affinity only +at activation time. + +Reported-by: Nianyao Tang +Signed-off-by: Marc Zyngier +Signed-off-by: Thomas Gleixner +Tested-by: Nianyao Tang +Link: https://lore.kernel.org/r/20240705093155.871070-2-maz@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-gic-v3-its.c | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c +index a9469751720c..b30319c65e7f 100644 +--- a/drivers/irqchip/irq-gic-v3-its.c ++++ b/drivers/irqchip/irq-gic-v3-its.c +@@ -1789,13 +1789,9 @@ static void its_map_vm(struct its_node *its, struct its_vm *vm) + + for (i = 0; i < vm->nr_vpes; i++) { + struct its_vpe *vpe = vm->vpes[i]; +- struct irq_data *d = irq_get_irq_data(vpe->irq); + +- /* Map the VPE to the first possible CPU */ +- vpe->col_idx = cpumask_first(cpu_online_mask); + its_send_vmapp(its, vpe, true); + its_send_vinvall(its, vpe); +- irq_data_update_effective_affinity(d, cpumask_of(vpe->col_idx)); + } + } + +@@ -4518,6 +4514,10 @@ static int its_vpe_irq_domain_activate(struct irq_domain *domain, + struct its_vpe *vpe = irq_data_get_irq_chip_data(d); + struct its_node *its; + ++ /* Map the VPE to the first possible CPU */ ++ vpe->col_idx = cpumask_first(cpu_online_mask); ++ irq_data_update_effective_affinity(d, cpumask_of(vpe->col_idx)); ++ + /* + * If we use the list map, we issue VMAPP on demand... Unless + * we're on a GICv4.1 and we eagerly map the VPE on all ITSs +@@ -4526,9 +4526,6 @@ static int its_vpe_irq_domain_activate(struct irq_domain *domain, + if (!gic_requires_eager_mapping()) + return 0; + +- /* Map the VPE to the first possible CPU */ +- vpe->col_idx = cpumask_first(cpu_online_mask); +- + list_for_each_entry(its, &its_nodes, entry) { + if (!is_v4(its)) + continue; +@@ -4537,8 +4534,6 @@ static int its_vpe_irq_domain_activate(struct irq_domain *domain, + its_send_vinvall(its, vpe); + } + +- irq_data_update_effective_affinity(d, cpumask_of(vpe->col_idx)); +- + return 0; + } + +-- +2.43.0 + diff --git a/queue-5.10/kselftests-dmabuf-heaps-ensure-the-driver-name-is-nu.patch b/queue-5.10/kselftests-dmabuf-heaps-ensure-the-driver-name-is-nu.patch new file mode 100644 index 00000000000..e3f1f96ee14 --- /dev/null +++ b/queue-5.10/kselftests-dmabuf-heaps-ensure-the-driver-name-is-nu.patch @@ -0,0 +1,55 @@ +From 763aa8d09a58712cf9410b9a4dcc150145e3d958 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jul 2024 10:46:04 +0800 +Subject: kselftests: dmabuf-heaps: Ensure the driver name is null-terminated + +From: Zenghui Yu + +[ Upstream commit 291e4baf70019f17a81b7b47aeb186b27d222159 ] + +Even if a vgem device is configured in, we will skip the import_vgem_fd() +test almost every time. + + TAP version 13 + 1..11 + # Testing heap: system + # ======================================= + # Testing allocation and importing: + ok 1 # SKIP Could not open vgem -1 + +The problem is that we use the DRM_IOCTL_VERSION ioctl to query the driver +version information but leave the name field a non-null-terminated string. +Terminate it properly to actually test against the vgem device. + +While at it, let's check the length of the driver name is exactly 4 bytes +and return early otherwise (in case there is a name like "vgemfoo" that +gets converted to "vgem\0" unexpectedly). + +Signed-off-by: Zenghui Yu +Signed-off-by: Daniel Vetter +Link: https://patchwork.freedesktop.org/patch/msgid/20240729024604.2046-1-yuzenghui@huawei.com +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c +index 909da9cdda97..aa4be40f7d49 100644 +--- a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c ++++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c +@@ -29,9 +29,11 @@ static int check_vgem(int fd) + version.name = name; + + ret = ioctl(fd, DRM_IOCTL_VERSION, &version); +- if (ret) ++ if (ret || version.name_len != 4) + return 0; + ++ name[4] = '\0'; ++ + return !strcmp(name, "vgem"); + } + +-- +2.43.0 + diff --git a/queue-5.10/leds-spi-byte-call-of_node_put-on-error-path.patch b/queue-5.10/leds-spi-byte-call-of_node_put-on-error-path.patch new file mode 100644 index 00000000000..0ef3efa9b8d --- /dev/null +++ b/queue-5.10/leds-spi-byte-call-of_node_put-on-error-path.patch @@ -0,0 +1,61 @@ +From 0ac2337e2560096ec4003fb13b3ffe5e595dde0f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Jun 2024 20:29:18 +0300 +Subject: leds: spi-byte: Call of_node_put() on error path + +From: Andy Shevchenko + +[ Upstream commit 7f9ab862e05c5bc755f65bf6db7edcffb3b49dfc ] + +Add a missing call to of_node_put(np) on error. + +Signed-off-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20240606173037.3091598-2-andriy.shevchenko@linux.intel.com +Signed-off-by: Lee Jones +Signed-off-by: Sasha Levin +--- + drivers/leds/leds-spi-byte.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c +index f1964c96fb15..82696e0607a5 100644 +--- a/drivers/leds/leds-spi-byte.c ++++ b/drivers/leds/leds-spi-byte.c +@@ -91,7 +91,6 @@ static int spi_byte_probe(struct spi_device *spi) + dev_err(dev, "Device must have exactly one LED sub-node."); + return -EINVAL; + } +- child = of_get_next_available_child(dev_of_node(dev), NULL); + + led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL); + if (!led) +@@ -107,11 +106,13 @@ static int spi_byte_probe(struct spi_device *spi) + led->ldev.max_brightness = led->cdef->max_value - led->cdef->off_value; + led->ldev.brightness_set_blocking = spi_byte_brightness_set_blocking; + ++ child = of_get_next_available_child(dev_of_node(dev), NULL); + state = of_get_property(child, "default-state", NULL); + if (state) { + if (!strcmp(state, "on")) { + led->ldev.brightness = led->ldev.max_brightness; + } else if (strcmp(state, "off")) { ++ of_node_put(child); + /* all other cases except "off" */ + dev_err(dev, "default-state can only be 'on' or 'off'"); + return -EINVAL; +@@ -122,9 +123,12 @@ static int spi_byte_probe(struct spi_device *spi) + + ret = devm_led_classdev_register(&spi->dev, &led->ldev); + if (ret) { ++ of_node_put(child); + mutex_destroy(&led->mutex); + return ret; + } ++ ++ of_node_put(child); + spi_set_drvdata(spi, led); + + return 0; +-- +2.43.0 + diff --git a/queue-5.10/lib-generic-radix-tree.c-fix-rare-race-in-__genradix.patch b/queue-5.10/lib-generic-radix-tree.c-fix-rare-race-in-__genradix.patch new file mode 100644 index 00000000000..239a806bf5e --- /dev/null +++ b/queue-5.10/lib-generic-radix-tree.c-fix-rare-race-in-__genradix.patch @@ -0,0 +1,39 @@ +From ced720e90a41d68edfef41b2d917192bea608ac6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 10 Aug 2024 21:04:35 -0400 +Subject: lib/generic-radix-tree.c: Fix rare race in __genradix_ptr_alloc() + +From: Kent Overstreet + +[ Upstream commit b2f11c6f3e1fc60742673b8675c95b78447f3dae ] + +If we need to increase the tree depth, allocate a new node, and then +race with another thread that increased the tree depth before us, we'll +still have a preallocated node that might be used later. + +If we then use that node for a new non-root node, it'll still have a +pointer to the old root instead of being zeroed - fix this by zeroing it +in the cmpxchg failure path. + +Signed-off-by: Kent Overstreet +Signed-off-by: Sasha Levin +--- + lib/generic-radix-tree.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/generic-radix-tree.c b/lib/generic-radix-tree.c +index f25eb111c051..34d3ac52de89 100644 +--- a/lib/generic-radix-tree.c ++++ b/lib/generic-radix-tree.c +@@ -131,6 +131,8 @@ void *__genradix_ptr_alloc(struct __genradix *radix, size_t offset, + if ((v = cmpxchg_release(&radix->root, r, new_root)) == r) { + v = new_root; + new_node = NULL; ++ } else { ++ new_node->children[0] = NULL; + } + } + +-- +2.43.0 + diff --git a/queue-5.10/libbpf-add-null-checks-to-bpf_object__-prev_map-next.patch b/queue-5.10/libbpf-add-null-checks-to-bpf_object__-prev_map-next.patch new file mode 100644 index 00000000000..1ff195efbcd --- /dev/null +++ b/queue-5.10/libbpf-add-null-checks-to-bpf_object__-prev_map-next.patch @@ -0,0 +1,59 @@ +From 1562484e3a48be236bf88343618e0aad9ec04c40 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jul 2024 10:34:36 +0200 +Subject: libbpf: Add NULL checks to bpf_object__{prev_map,next_map} + +From: Andreas Ziegler + +[ Upstream commit cedc12c5b57f7efa6dbebfb2b140e8675f5a2616 ] + +In the current state, an erroneous call to +bpf_object__find_map_by_name(NULL, ...) leads to a segmentation +fault through the following call chain: + + bpf_object__find_map_by_name(obj = NULL, ...) + -> bpf_object__for_each_map(pos, obj = NULL) + -> bpf_object__next_map((obj = NULL), NULL) + -> return (obj = NULL)->maps + +While calling bpf_object__find_map_by_name with obj = NULL is +obviously incorrect, this should not lead to a segmentation +fault but rather be handled gracefully. + +As __bpf_map__iter already handles this situation correctly, we +can delegate the check for the regular case there and only add +a check in case the prev or next parameter is NULL. + +Signed-off-by: Andreas Ziegler +Signed-off-by: Daniel Borkmann +Link: https://lore.kernel.org/bpf/20240703083436.505124-1-ziegler.andreas@siemens.com +Signed-off-by: Sasha Levin +--- + tools/lib/bpf/libbpf.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c +index 015ed8253f73..33cdcfe10634 100644 +--- a/tools/lib/bpf/libbpf.c ++++ b/tools/lib/bpf/libbpf.c +@@ -9005,7 +9005,7 @@ __bpf_map__iter(const struct bpf_map *m, const struct bpf_object *obj, int i) + struct bpf_map * + bpf_map__next(const struct bpf_map *prev, const struct bpf_object *obj) + { +- if (prev == NULL) ++ if (prev == NULL && obj != NULL) + return obj->maps; + + return __bpf_map__iter(prev, obj, 1); +@@ -9014,7 +9014,7 @@ bpf_map__next(const struct bpf_map *prev, const struct bpf_object *obj) + struct bpf_map * + bpf_map__prev(const struct bpf_map *next, const struct bpf_object *obj) + { +- if (next == NULL) { ++ if (next == NULL && obj != NULL) { + if (!obj->nr_maps) + return NULL; + return obj->maps + obj->nr_maps - 1; +-- +2.43.0 + diff --git a/queue-5.10/media-qcom-camss-add-check-for-v4l2_fwnode_endpoint_.patch b/queue-5.10/media-qcom-camss-add-check-for-v4l2_fwnode_endpoint_.patch new file mode 100644 index 00000000000..aa494f38965 --- /dev/null +++ b/queue-5.10/media-qcom-camss-add-check-for-v4l2_fwnode_endpoint_.patch @@ -0,0 +1,39 @@ +From 5a8e1f4e29fb20dfad49933343e4dd443f611edc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Jun 2024 09:35:22 +0800 +Subject: media: qcom: camss: Add check for v4l2_fwnode_endpoint_parse + +From: Chen Ni + +[ Upstream commit 4caf6d93d9f2c11d6441c64e1c549c445fa322ed ] + +Add check for the return value of v4l2_fwnode_endpoint_parse() and +return the error if it fails in order to catch the error. + +Signed-off-by: Chen Ni +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/platform/qcom/camss/camss.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c +index 9186881afc98..d074f426980d 100644 +--- a/drivers/media/platform/qcom/camss/camss.c ++++ b/drivers/media/platform/qcom/camss/camss.c +@@ -431,8 +431,11 @@ static int camss_of_parse_endpoint_node(struct device *dev, + struct v4l2_fwnode_bus_mipi_csi2 *mipi_csi2; + struct v4l2_fwnode_endpoint vep = { { 0 } }; + unsigned int i; ++ int ret; + +- v4l2_fwnode_endpoint_parse(of_fwnode_handle(node), &vep); ++ ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(node), &vep); ++ if (ret) ++ return ret; + + csd->interface.csiphy_id = vep.base.port; + +-- +2.43.0 + diff --git a/queue-5.10/media-vivid-don-t-set-hdmi-tx-controls-if-there-are-.patch b/queue-5.10/media-vivid-don-t-set-hdmi-tx-controls-if-there-are-.patch new file mode 100644 index 00000000000..498fd446be3 --- /dev/null +++ b/queue-5.10/media-vivid-don-t-set-hdmi-tx-controls-if-there-are-.patch @@ -0,0 +1,56 @@ +From 7ddf8fbbfb8b9e106651b42c9900ad680bdf012c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 Jun 2024 12:52:59 +0300 +Subject: media: vivid: don't set HDMI TX controls if there are no HDMI outputs + +From: Hans Verkuil + +[ Upstream commit 17763960b1784578e8fe915304b330922f646209 ] + +When setting the EDID it would attempt to update two controls +that are only present if there is an HDMI output configured. + +If there isn't any (e.g. when the vivid module is loaded with +node_types=1), then calling VIDIOC_S_EDID would crash. + +Fix this by first checking if outputs are present. + +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c b/drivers/media/test-drivers/vivid/vivid-vid-cap.c +index 907781c2e613..2ce7f5567f51 100644 +--- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c ++++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c +@@ -1802,8 +1802,10 @@ int vidioc_s_edid(struct file *file, void *_fh, + return -EINVAL; + if (edid->blocks == 0) { + dev->edid_blocks = 0; +- v4l2_ctrl_s_ctrl(dev->ctrl_tx_edid_present, 0); +- v4l2_ctrl_s_ctrl(dev->ctrl_tx_hotplug, 0); ++ if (dev->num_outputs) { ++ v4l2_ctrl_s_ctrl(dev->ctrl_tx_edid_present, 0); ++ v4l2_ctrl_s_ctrl(dev->ctrl_tx_hotplug, 0); ++ } + phys_addr = CEC_PHYS_ADDR_INVALID; + goto set_phys_addr; + } +@@ -1827,8 +1829,10 @@ int vidioc_s_edid(struct file *file, void *_fh, + display_present |= + dev->display_present[i] << j++; + +- v4l2_ctrl_s_ctrl(dev->ctrl_tx_edid_present, display_present); +- v4l2_ctrl_s_ctrl(dev->ctrl_tx_hotplug, display_present); ++ if (dev->num_outputs) { ++ v4l2_ctrl_s_ctrl(dev->ctrl_tx_edid_present, display_present); ++ v4l2_ctrl_s_ctrl(dev->ctrl_tx_hotplug, display_present); ++ } + + set_phys_addr: + /* TODO: a proper hotplug detect cycle should be emulated here */ +-- +2.43.0 + diff --git a/queue-5.10/media-vivid-fix-wrong-sizeimage-value-for-mplane.patch b/queue-5.10/media-vivid-fix-wrong-sizeimage-value-for-mplane.patch new file mode 100644 index 00000000000..18567ab366f --- /dev/null +++ b/queue-5.10/media-vivid-fix-wrong-sizeimage-value-for-mplane.patch @@ -0,0 +1,87 @@ +From e83ec4650ceb01901be6c122219d9a878af977c7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Jun 2024 12:59:13 +0200 +Subject: media: vivid: fix wrong sizeimage value for mplane + +From: Hans Verkuil + +[ Upstream commit 0fd7c0c2c156270dceb8c15fad3120cdce03e539 ] + +In several places a division by fmt->vdownsampling[p] was +missing in the sizeimage[p] calculation, causing incorrect +behavior for multiplanar formats were some planes are smaller +than the first plane. + +Found by new v4l2-compliance tests. + +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 5 +++-- + drivers/media/test-drivers/vivid/vivid-vid-out.c | 16 +++++++++------- + 2 files changed, 12 insertions(+), 9 deletions(-) + +diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c b/drivers/media/test-drivers/vivid/vivid-vid-cap.c +index 437889e51ca0..907781c2e613 100644 +--- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c ++++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c +@@ -113,8 +113,9 @@ static int vid_cap_queue_setup(struct vb2_queue *vq, + if (*nplanes != buffers) + return -EINVAL; + for (p = 0; p < buffers; p++) { +- if (sizes[p] < tpg_g_line_width(&dev->tpg, p) * h + +- dev->fmt_cap->data_offset[p]) ++ if (sizes[p] < tpg_g_line_width(&dev->tpg, p) * h / ++ dev->fmt_cap->vdownsampling[p] + ++ dev->fmt_cap->data_offset[p]) + return -EINVAL; + } + } else { +diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c b/drivers/media/test-drivers/vivid/vivid-vid-out.c +index cd6c247547d6..9038be90ab35 100644 +--- a/drivers/media/test-drivers/vivid/vivid-vid-out.c ++++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c +@@ -63,14 +63,16 @@ static int vid_out_queue_setup(struct vb2_queue *vq, + if (sizes[0] < size) + return -EINVAL; + for (p = 1; p < planes; p++) { +- if (sizes[p] < dev->bytesperline_out[p] * h + +- vfmt->data_offset[p]) ++ if (sizes[p] < dev->bytesperline_out[p] * h / ++ vfmt->vdownsampling[p] + ++ vfmt->data_offset[p]) + return -EINVAL; + } + } else { + for (p = 0; p < planes; p++) +- sizes[p] = p ? dev->bytesperline_out[p] * h + +- vfmt->data_offset[p] : size; ++ sizes[p] = p ? dev->bytesperline_out[p] * h / ++ vfmt->vdownsampling[p] + ++ vfmt->data_offset[p] : size; + } + + if (vq->num_buffers + *nbuffers < 2) +@@ -127,7 +129,7 @@ static int vid_out_buf_prepare(struct vb2_buffer *vb) + + for (p = 0; p < planes; p++) { + if (p) +- size = dev->bytesperline_out[p] * h; ++ size = dev->bytesperline_out[p] * h / vfmt->vdownsampling[p]; + size += vb->planes[p].data_offset; + + if (vb2_get_plane_payload(vb, p) < size) { +@@ -334,8 +336,8 @@ int vivid_g_fmt_vid_out(struct file *file, void *priv, + for (p = 0; p < mp->num_planes; p++) { + mp->plane_fmt[p].bytesperline = dev->bytesperline_out[p]; + mp->plane_fmt[p].sizeimage = +- mp->plane_fmt[p].bytesperline * mp->height + +- fmt->data_offset[p]; ++ mp->plane_fmt[p].bytesperline * mp->height / ++ fmt->vdownsampling[p] + fmt->data_offset[p]; + } + for (p = fmt->buffers; p < fmt->planes; p++) { + unsigned stride = dev->bytesperline_out[p]; +-- +2.43.0 + diff --git a/queue-5.10/mips-cevt-r4k-don-t-call-get_c0_compare_int-if-timer.patch b/queue-5.10/mips-cevt-r4k-don-t-call-get_c0_compare_int-if-timer.patch new file mode 100644 index 00000000000..e395651d001 --- /dev/null +++ b/queue-5.10/mips-cevt-r4k-don-t-call-get_c0_compare_int-if-timer.patch @@ -0,0 +1,78 @@ +From 42a885a2cfcefd84016a5145dd52812cf2f427a1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 13 Aug 2024 10:59:08 +0100 +Subject: MIPS: cevt-r4k: Don't call get_c0_compare_int if timer irq is + installed +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jiaxun Yang + +[ Upstream commit 50f2b98dc83de7809a5c5bf0ccf9af2e75c37c13 ] + +This avoids warning: + +[ 0.118053] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:283 + +Caused by get_c0_compare_int on secondary CPU. + +We also skipped saving IRQ number to struct clock_event_device *cd as +it's never used by clockevent core, as per comments it's only meant +for "non CPU local devices". + +Reported-by: Serge Semin +Closes: https://lore.kernel.org/linux-mips/6szkkqxpsw26zajwysdrwplpjvhl5abpnmxgu2xuj3dkzjnvsf@4daqrz4mf44k/ +Signed-off-by: Jiaxun Yang +Reviewed-by: Philippe Mathieu-Daudé +Reviewed-by: Serge Semin +Tested-by: Serge Semin +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/kernel/cevt-r4k.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c +index 995ad9e69ded..23207516015c 100644 +--- a/arch/mips/kernel/cevt-r4k.c ++++ b/arch/mips/kernel/cevt-r4k.c +@@ -307,13 +307,6 @@ int r4k_clockevent_init(void) + if (!c0_compare_int_usable()) + return -ENXIO; + +- /* +- * With vectored interrupts things are getting platform specific. +- * get_c0_compare_int is a hook to allow a platform to return the +- * interrupt number of its liking. +- */ +- irq = get_c0_compare_int(); +- + cd = &per_cpu(mips_clockevent_device, cpu); + + cd->name = "MIPS"; +@@ -324,7 +317,6 @@ int r4k_clockevent_init(void) + min_delta = calculate_min_delta(); + + cd->rating = 300; +- cd->irq = irq; + cd->cpumask = cpumask_of(cpu); + cd->set_next_event = mips_next_event; + cd->event_handler = mips_event_handler; +@@ -336,6 +328,13 @@ int r4k_clockevent_init(void) + + cp0_timer_irq_installed = 1; + ++ /* ++ * With vectored interrupts things are getting platform specific. ++ * get_c0_compare_int is a hook to allow a platform to return the ++ * interrupt number of its liking. ++ */ ++ irq = get_c0_compare_int(); ++ + if (request_irq(irq, c0_compare_interrupt, flags, "timer", + c0_compare_interrupt)) + pr_err("Failed to request irq %d (timer)\n", irq); +-- +2.43.0 + diff --git a/queue-5.10/net-bridge-br_fdb_external_learn_add-always-set-ext_.patch b/queue-5.10/net-bridge-br_fdb_external_learn_add-always-set-ext_.patch new file mode 100644 index 00000000000..409e63aca72 --- /dev/null +++ b/queue-5.10/net-bridge-br_fdb_external_learn_add-always-set-ext_.patch @@ -0,0 +1,58 @@ +From 6ae272a3aa70ebbb052eaa9683fe6a08b7467e84 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 Sep 2024 10:19:57 +0200 +Subject: net: bridge: br_fdb_external_learn_add(): always set EXT_LEARN + +From: Jonas Gorski + +[ Upstream commit bee2ef946d3184e99077be526567d791c473036f ] + +When userspace wants to take over a fdb entry by setting it as +EXTERN_LEARNED, we set both flags BR_FDB_ADDED_BY_EXT_LEARN and +BR_FDB_ADDED_BY_USER in br_fdb_external_learn_add(). + +If the bridge updates the entry later because its port changed, we clear +the BR_FDB_ADDED_BY_EXT_LEARN flag, but leave the BR_FDB_ADDED_BY_USER +flag set. + +If userspace then wants to take over the entry again, +br_fdb_external_learn_add() sees that BR_FDB_ADDED_BY_USER and skips +setting the BR_FDB_ADDED_BY_EXT_LEARN flags, thus silently ignores the +update. + +Fix this by always allowing to set BR_FDB_ADDED_BY_EXT_LEARN regardless +if this was a user fdb entry or not. + +Fixes: 710ae7287737 ("net: bridge: Mark FDB entries that were added by user as such") +Signed-off-by: Jonas Gorski +Acked-by: Nikolay Aleksandrov +Reviewed-by: Ido Schimmel +Link: https://patch.msgid.link/20240903081958.29951-1-jonas.gorski@bisdn.de +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/bridge/br_fdb.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c +index 8a6470a21702..8751571a3cb0 100644 +--- a/net/bridge/br_fdb.c ++++ b/net/bridge/br_fdb.c +@@ -1238,12 +1238,10 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, + modified = true; + } + +- if (test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags)) { ++ if (test_and_set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags)) { + /* Refresh entry */ + fdb->used = jiffies; +- } else if (!test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags)) { +- /* Take over SW learned entry */ +- set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags); ++ } else { + modified = true; + } + +-- +2.43.0 + diff --git a/queue-5.10/net-dpaa-avoid-on-stack-arrays-of-nr_cpus-elements.patch b/queue-5.10/net-dpaa-avoid-on-stack-arrays-of-nr_cpus-elements.patch new file mode 100644 index 00000000000..373be6f69cc --- /dev/null +++ b/queue-5.10/net-dpaa-avoid-on-stack-arrays-of-nr_cpus-elements.patch @@ -0,0 +1,132 @@ +From 064b1f5234f2330438f30c68ce0f4fa461bf2215 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 14 Jul 2024 01:53:32 +0300 +Subject: net: dpaa: avoid on-stack arrays of NR_CPUS elements + +From: Vladimir Oltean + +[ Upstream commit 555a05d84ca2c587e2d4777006e2c2fb3dfbd91d ] + +The dpaa-eth driver is written for PowerPC and Arm SoCs which have 1-24 +CPUs. It depends on CONFIG_NR_CPUS having a reasonably small value in +Kconfig. Otherwise, there are 2 functions which allocate on-stack arrays +of NR_CPUS elements, and these can quickly explode in size, leading to +warnings such as: + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:3280:12: warning: + stack frame size (16664) exceeds limit (2048) in 'dpaa_eth_probe' [-Wframe-larger-than] + +The problem is twofold: +- Reducing the array size to the boot-time num_possible_cpus() (rather + than the compile-time NR_CPUS) creates a variable-length array, + which should be avoided in the Linux kernel. +- Using NR_CPUS as an array size makes the driver blow up in stack + consumption with generic, as opposed to hand-crafted, .config files. + +A simple solution is to use dynamic allocation for num_possible_cpus() +elements (aka a small number determined at runtime). + +Link: https://lore.kernel.org/all/202406261920.l5pzM1rj-lkp@intel.com/ +Signed-off-by: Vladimir Oltean +Reviewed-by: Breno Leitao +Acked-by: Madalin Bucur +Link: https://patch.msgid.link/20240713225336.1746343-2-vladimir.oltean@nxp.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + .../net/ethernet/freescale/dpaa/dpaa_eth.c | 20 ++++++++++++++----- + .../ethernet/freescale/dpaa/dpaa_ethtool.c | 10 +++++++++- + 2 files changed, 24 insertions(+), 6 deletions(-) + +diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +index cb7c028b1bf5..90bd5583ac34 100644 +--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c ++++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +@@ -908,14 +908,18 @@ static inline void dpaa_setup_egress(const struct dpaa_priv *priv, + } + } + +-static void dpaa_fq_setup(struct dpaa_priv *priv, +- const struct dpaa_fq_cbs *fq_cbs, +- struct fman_port *tx_port) ++static int dpaa_fq_setup(struct dpaa_priv *priv, ++ const struct dpaa_fq_cbs *fq_cbs, ++ struct fman_port *tx_port) + { + int egress_cnt = 0, conf_cnt = 0, num_portals = 0, portal_cnt = 0, cpu; + const cpumask_t *affine_cpus = qman_affine_cpus(); +- u16 channels[NR_CPUS]; + struct dpaa_fq *fq; ++ u16 *channels; ++ ++ channels = kcalloc(num_possible_cpus(), sizeof(u16), GFP_KERNEL); ++ if (!channels) ++ return -ENOMEM; + + for_each_cpu_and(cpu, affine_cpus, cpu_online_mask) + channels[num_portals++] = qman_affine_channel(cpu); +@@ -974,6 +978,10 @@ static void dpaa_fq_setup(struct dpaa_priv *priv, + break; + } + } ++ ++ kfree(channels); ++ ++ return 0; + } + + static inline int dpaa_tx_fq_to_id(const struct dpaa_priv *priv, +@@ -3015,7 +3023,9 @@ static int dpaa_eth_probe(struct platform_device *pdev) + */ + dpaa_eth_add_channel(priv->channel, &pdev->dev); + +- dpaa_fq_setup(priv, &dpaa_fq_cbs, priv->mac_dev->port[TX]); ++ err = dpaa_fq_setup(priv, &dpaa_fq_cbs, priv->mac_dev->port[TX]); ++ if (err) ++ goto free_dpaa_bps; + + /* Create a congestion group for this netdev, with + * dynamically-allocated CGR ID. +diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +index 2f9075429c43..d8cb0b99684a 100644 +--- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c ++++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +@@ -537,12 +537,16 @@ static int dpaa_set_coalesce(struct net_device *dev, + struct ethtool_coalesce *c) + { + const cpumask_t *cpus = qman_affine_cpus(); +- bool needs_revert[NR_CPUS] = {false}; + struct qman_portal *portal; + u32 period, prev_period; + u8 thresh, prev_thresh; ++ bool *needs_revert; + int cpu, res; + ++ needs_revert = kcalloc(num_possible_cpus(), sizeof(bool), GFP_KERNEL); ++ if (!needs_revert) ++ return -ENOMEM; ++ + period = c->rx_coalesce_usecs; + thresh = c->rx_max_coalesced_frames; + +@@ -565,6 +569,8 @@ static int dpaa_set_coalesce(struct net_device *dev, + needs_revert[cpu] = true; + } + ++ kfree(needs_revert); ++ + return 0; + + revert_values: +@@ -578,6 +584,8 @@ static int dpaa_set_coalesce(struct net_device *dev, + qman_dqrr_set_ithresh(portal, prev_thresh); + } + ++ kfree(needs_revert); ++ + return res; + } + +-- +2.43.0 + diff --git a/queue-5.10/net-dsa-vsc73xx-fix-possible-subblocks-range-of-capt.patch b/queue-5.10/net-dsa-vsc73xx-fix-possible-subblocks-range-of-capt.patch new file mode 100644 index 00000000000..b87cea76acc --- /dev/null +++ b/queue-5.10/net-dsa-vsc73xx-fix-possible-subblocks-range-of-capt.patch @@ -0,0 +1,62 @@ +From 274f602086b0e1e686260eea5d4ef6df5e92e9e4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 Sep 2024 22:33:41 +0200 +Subject: net: dsa: vsc73xx: fix possible subblocks range of CAPT block + +From: Pawel Dembicki + +[ Upstream commit 8e69c96df771ab469cec278edb47009351de4da6 ] + +CAPT block (CPU Capture Buffer) have 7 sublocks: 0-3, 4, 6, 7. +Function 'vsc73xx_is_addr_valid' allows to use only block 0 at this +moment. + +This patch fix it. + +Fixes: 05bd97fc559d ("net: dsa: Add Vitesse VSC73xx DSA router driver") +Signed-off-by: Pawel Dembicki +Reviewed-by: Florian Fainelli +Link: https://patch.msgid.link/20240903203340.1518789-1-paweldembicki@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/vitesse-vsc73xx-core.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c +index 8a21902212e0..7c2780ccf9d6 100644 +--- a/drivers/net/dsa/vitesse-vsc73xx-core.c ++++ b/drivers/net/dsa/vitesse-vsc73xx-core.c +@@ -35,7 +35,7 @@ + #define VSC73XX_BLOCK_ANALYZER 0x2 /* Only subblock 0 */ + #define VSC73XX_BLOCK_MII 0x3 /* Subblocks 0 and 1 */ + #define VSC73XX_BLOCK_MEMINIT 0x3 /* Only subblock 2 */ +-#define VSC73XX_BLOCK_CAPTURE 0x4 /* Only subblock 2 */ ++#define VSC73XX_BLOCK_CAPTURE 0x4 /* Subblocks 0-4, 6, 7 */ + #define VSC73XX_BLOCK_ARBITER 0x5 /* Only subblock 0 */ + #define VSC73XX_BLOCK_SYSTEM 0x7 /* Only subblock 0 */ + +@@ -371,13 +371,19 @@ int vsc73xx_is_addr_valid(u8 block, u8 subblock) + break; + + case VSC73XX_BLOCK_MII: +- case VSC73XX_BLOCK_CAPTURE: + case VSC73XX_BLOCK_ARBITER: + switch (subblock) { + case 0 ... 1: + return 1; + } + break; ++ case VSC73XX_BLOCK_CAPTURE: ++ switch (subblock) { ++ case 0 ... 4: ++ case 6 ... 7: ++ return 1; ++ } ++ break; + } + + return 0; +-- +2.43.0 + diff --git a/queue-5.10/net-usb-don-t-write-directly-to-netdev-dev_addr.patch b/queue-5.10/net-usb-don-t-write-directly-to-netdev-dev_addr.patch new file mode 100644 index 00000000000..7cfc86b60c1 --- /dev/null +++ b/queue-5.10/net-usb-don-t-write-directly-to-netdev-dev_addr.patch @@ -0,0 +1,236 @@ +From 1c06a727aa979f12b858c506dcdf2bc4be388d8e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Oct 2021 06:12:06 -0700 +Subject: net: usb: don't write directly to netdev->dev_addr + +From: Jakub Kicinski + +[ Upstream commit 2674e7ea22ba0e22a2d1603bd51e0b8f6442a267 ] + +Commit 406f42fa0d3c ("net-next: When a bond have a massive amount +of VLANs...") introduced a rbtree for faster Ethernet address look +up. To maintain netdev->dev_addr in this tree we need to make all +the writes to it got through appropriate helpers. + +Manually fix all net/usb drivers without separate maintainers. + +v2: catc does DMA to the buffer, leave the conversion to Oliver + +Signed-off-by: Jakub Kicinski +Stable-dep-of: bab8eb0dd4cb ("usbnet: modern method to get random MAC") +Signed-off-by: Sasha Levin +--- + drivers/net/usb/ch9200.c | 4 +++- + drivers/net/usb/cx82310_eth.c | 5 +++-- + drivers/net/usb/kaweth.c | 3 +-- + drivers/net/usb/mcs7830.c | 4 +++- + drivers/net/usb/sierra_net.c | 6 ++++-- + drivers/net/usb/sr9700.c | 4 +++- + drivers/net/usb/sr9800.c | 5 +++-- + drivers/net/usb/usbnet.c | 6 ++++-- + 8 files changed, 24 insertions(+), 13 deletions(-) + +diff --git a/drivers/net/usb/ch9200.c b/drivers/net/usb/ch9200.c +index d7f3b70d5477..f69d9b902da0 100644 +--- a/drivers/net/usb/ch9200.c ++++ b/drivers/net/usb/ch9200.c +@@ -336,6 +336,7 @@ static int ch9200_bind(struct usbnet *dev, struct usb_interface *intf) + { + int retval = 0; + unsigned char data[2]; ++ u8 addr[ETH_ALEN]; + + retval = usbnet_get_endpoints(dev, intf); + if (retval) +@@ -383,7 +384,8 @@ static int ch9200_bind(struct usbnet *dev, struct usb_interface *intf) + retval = control_write(dev, REQUEST_WRITE, 0, MAC_REG_CTRL, data, 0x02, + CONTROL_TIMEOUT_MS); + +- retval = get_mac_address(dev, dev->net->dev_addr); ++ retval = get_mac_address(dev, addr); ++ eth_hw_addr_set(dev->net, addr); + + return retval; + } +diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c +index c4568a491dc4..79a47e2fd437 100644 +--- a/drivers/net/usb/cx82310_eth.c ++++ b/drivers/net/usb/cx82310_eth.c +@@ -146,6 +146,7 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf) + u8 link[3]; + int timeout = 50; + struct cx82310_priv *priv; ++ u8 addr[ETH_ALEN]; + + /* avoid ADSL modems - continue only if iProduct is "USB NET CARD" */ + if (usb_string(udev, udev->descriptor.iProduct, buf, sizeof(buf)) > 0 +@@ -202,12 +203,12 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf) + goto err; + + /* get the MAC address */ +- ret = cx82310_cmd(dev, CMD_GET_MAC_ADDR, true, NULL, 0, +- dev->net->dev_addr, ETH_ALEN); ++ ret = cx82310_cmd(dev, CMD_GET_MAC_ADDR, true, NULL, 0, addr, ETH_ALEN); + if (ret) { + netdev_err(dev->net, "unable to read MAC address: %d\n", ret); + goto err; + } ++ eth_hw_addr_set(dev->net, addr); + + /* start (does not seem to have any effect?) */ + ret = cx82310_cmd(dev, CMD_START, false, NULL, 0, NULL, 0); +diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c +index 144c686b4333..9b2bc1993ece 100644 +--- a/drivers/net/usb/kaweth.c ++++ b/drivers/net/usb/kaweth.c +@@ -1044,8 +1044,7 @@ static int kaweth_probe( + goto err_all_but_rxbuf; + + memcpy(netdev->broadcast, &bcast_addr, sizeof(bcast_addr)); +- memcpy(netdev->dev_addr, &kaweth->configuration.hw_addr, +- sizeof(kaweth->configuration.hw_addr)); ++ eth_hw_addr_set(netdev, (u8 *)&kaweth->configuration.hw_addr); + + netdev->netdev_ops = &kaweth_netdev_ops; + netdev->watchdog_timeo = KAWETH_TX_TIMEOUT; +diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c +index 7e40e2e2f372..57281296ba2c 100644 +--- a/drivers/net/usb/mcs7830.c ++++ b/drivers/net/usb/mcs7830.c +@@ -480,17 +480,19 @@ static const struct net_device_ops mcs7830_netdev_ops = { + static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) + { + struct net_device *net = dev->net; ++ u8 addr[ETH_ALEN]; + int ret; + int retry; + + /* Initial startup: Gather MAC address setting from EEPROM */ + ret = -EINVAL; + for (retry = 0; retry < 5 && ret; retry++) +- ret = mcs7830_hif_get_mac_address(dev, net->dev_addr); ++ ret = mcs7830_hif_get_mac_address(dev, addr); + if (ret) { + dev_warn(&dev->udev->dev, "Cannot read MAC address\n"); + goto out; + } ++ eth_hw_addr_set(net, addr); + + mcs7830_data_set_multicast(net); + +diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c +index 0abd257b634c..777f672f288c 100644 +--- a/drivers/net/usb/sierra_net.c ++++ b/drivers/net/usb/sierra_net.c +@@ -669,6 +669,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf) + 0x00, 0x00, SIERRA_NET_HIP_MSYNC_ID, 0x00}; + static const u8 shdwn_tmplate[sizeof(priv->shdwn_msg)] = { + 0x00, 0x00, SIERRA_NET_HIP_SHUTD_ID, 0x00}; ++ u8 mod[2]; + + dev_dbg(&dev->udev->dev, "%s", __func__); + +@@ -698,8 +699,9 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf) + dev->net->netdev_ops = &sierra_net_device_ops; + + /* change MAC addr to include, ifacenum, and to be unique */ +- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter); +- dev->net->dev_addr[ETH_ALEN-1] = ifacenum; ++ mod[0] = atomic_inc_return(&iface_counter); ++ mod[1] = ifacenum; ++ dev_addr_mod(dev->net, ETH_ALEN - 2, mod, 2); + + /* prepare shutdown message template */ + memcpy(priv->shdwn_msg, shdwn_tmplate, sizeof(priv->shdwn_msg)); +diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c +index 8d2e3daf03cf..1ec11a08820d 100644 +--- a/drivers/net/usb/sr9700.c ++++ b/drivers/net/usb/sr9700.c +@@ -326,6 +326,7 @@ static int sr9700_bind(struct usbnet *dev, struct usb_interface *intf) + { + struct net_device *netdev; + struct mii_if_info *mii; ++ u8 addr[ETH_ALEN]; + int ret; + + ret = usbnet_get_endpoints(dev, intf); +@@ -356,11 +357,12 @@ static int sr9700_bind(struct usbnet *dev, struct usb_interface *intf) + * EEPROM automatically to PAR. In case there is no EEPROM externally, + * a default MAC address is stored in PAR for making chip work properly. + */ +- if (sr_read(dev, SR_PAR, ETH_ALEN, netdev->dev_addr) < 0) { ++ if (sr_read(dev, SR_PAR, ETH_ALEN, addr) < 0) { + netdev_err(netdev, "Error reading MAC address\n"); + ret = -ENODEV; + goto out; + } ++ eth_hw_addr_set(netdev, addr); + + /* power up and reset phy */ + sr_write_reg(dev, SR_PRR, PRR_PHY_RST); +diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c +index a5332e99102a..351e0edcda2a 100644 +--- a/drivers/net/usb/sr9800.c ++++ b/drivers/net/usb/sr9800.c +@@ -731,6 +731,7 @@ static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf) + struct sr_data *data = (struct sr_data *)&dev->data; + u16 led01_mux, led23_mux; + int ret, embd_phy; ++ u8 addr[ETH_ALEN]; + u32 phyid; + u16 rx_ctl; + +@@ -756,12 +757,12 @@ static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf) + } + + /* Get the MAC address */ +- ret = sr_read_cmd(dev, SR_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, +- dev->net->dev_addr); ++ ret = sr_read_cmd(dev, SR_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, addr); + if (ret < 0) { + netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret); + return ret; + } ++ eth_hw_addr_set(dev->net, addr); + netdev_dbg(dev->net, "mac addr : %pM\n", dev->net->dev_addr); + + /* Initialize MII structure */ +diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c +index 01f80aea1605..e87d3108ef05 100644 +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -148,12 +148,13 @@ EXPORT_SYMBOL_GPL(usbnet_get_endpoints); + + int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) + { ++ u8 addr[ETH_ALEN]; + int tmp = -1, ret; + unsigned char buf [13]; + + ret = usb_string(dev->udev, iMACAddress, buf, sizeof buf); + if (ret == 12) +- tmp = hex2bin(dev->net->dev_addr, buf, 6); ++ tmp = hex2bin(addr, buf, 6); + if (tmp < 0) { + dev_dbg(&dev->udev->dev, + "bad MAC string %d fetch, %d\n", iMACAddress, tmp); +@@ -161,6 +162,7 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) + ret = -EINVAL; + return ret; + } ++ eth_hw_addr_set(dev->net, addr); + return 0; + } + EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr); +@@ -1694,7 +1696,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) + + dev->net = net; + strscpy(net->name, "usb%d", sizeof(net->name)); +- memcpy (net->dev_addr, node_id, sizeof node_id); ++ eth_hw_addr_set(net, node_id); + + /* rx and tx sides can use different message sizes; + * bind() should set rx_urb_size in that case. +-- +2.43.0 + diff --git a/queue-5.10/netfilter-nf_conncount-fix-wrong-variable-type.patch b/queue-5.10/netfilter-nf_conncount-fix-wrong-variable-type.patch new file mode 100644 index 00000000000..ae12afc9260 --- /dev/null +++ b/queue-5.10/netfilter-nf_conncount-fix-wrong-variable-type.patch @@ -0,0 +1,70 @@ +From 7c13f34338e2eff057ee6f3d3c506a0d40f37c74 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 31 May 2024 11:48:47 +0800 +Subject: netfilter: nf_conncount: fix wrong variable type + +From: Yunjian Wang + +[ Upstream commit 0b88d1654d556264bcd24a9cb6383f0888e30131 ] + +Now there is a issue is that code checks reports a warning: implicit +narrowing conversion from type 'unsigned int' to small type 'u8' (the +'keylen' variable). Fix it by removing the 'keylen' variable. + +Signed-off-by: Yunjian Wang +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nf_conncount.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/net/netfilter/nf_conncount.c b/net/netfilter/nf_conncount.c +index 82f36beb2e76..0ce12a33ffda 100644 +--- a/net/netfilter/nf_conncount.c ++++ b/net/netfilter/nf_conncount.c +@@ -310,7 +310,6 @@ insert_tree(struct net *net, + struct nf_conncount_rb *rbconn; + struct nf_conncount_tuple *conn; + unsigned int count = 0, gc_count = 0; +- u8 keylen = data->keylen; + bool do_gc = true; + + spin_lock_bh(&nf_conncount_locks[hash]); +@@ -322,7 +321,7 @@ insert_tree(struct net *net, + rbconn = rb_entry(*rbnode, struct nf_conncount_rb, node); + + parent = *rbnode; +- diff = key_diff(key, rbconn->key, keylen); ++ diff = key_diff(key, rbconn->key, data->keylen); + if (diff < 0) { + rbnode = &((*rbnode)->rb_left); + } else if (diff > 0) { +@@ -367,7 +366,7 @@ insert_tree(struct net *net, + + conn->tuple = *tuple; + conn->zone = *zone; +- memcpy(rbconn->key, key, sizeof(u32) * keylen); ++ memcpy(rbconn->key, key, sizeof(u32) * data->keylen); + + nf_conncount_list_init(&rbconn->list); + list_add(&conn->node, &rbconn->list.head); +@@ -392,7 +391,6 @@ count_tree(struct net *net, + struct rb_node *parent; + struct nf_conncount_rb *rbconn; + unsigned int hash; +- u8 keylen = data->keylen; + + hash = jhash2(key, data->keylen, conncount_rnd) % CONNCOUNT_SLOTS; + root = &data->root[hash]; +@@ -403,7 +401,7 @@ count_tree(struct net *net, + + rbconn = rb_entry(parent, struct nf_conncount_rb, node); + +- diff = key_diff(key, rbconn->key, keylen); ++ diff = key_diff(key, rbconn->key, data->keylen); + if (diff < 0) { + parent = rcu_dereference_raw(parent->rb_left); + } else if (diff > 0) { +-- +2.43.0 + diff --git a/queue-5.10/nfsv4-add-missing-rescheduling-points-in-nfs_client_.patch b/queue-5.10/nfsv4-add-missing-rescheduling-points-in-nfs_client_.patch new file mode 100644 index 00000000000..960683dc9d7 --- /dev/null +++ b/queue-5.10/nfsv4-add-missing-rescheduling-points-in-nfs_client_.patch @@ -0,0 +1,44 @@ +From dd317fd2b7ff4d034685dc2d63b3900eea2314b0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 Aug 2024 14:05:00 -0400 +Subject: NFSv4: Add missing rescheduling points in + nfs_client_return_marked_delegations + +From: Trond Myklebust + +[ Upstream commit a017ad1313fc91bdf235097fd0a02f673fc7bb11 ] + +We're seeing reports of soft lockups when iterating through the loops, +so let's add rescheduling points. + +Signed-off-by: Trond Myklebust +Reviewed-by: Jeff Layton +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/super.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/nfs/super.c b/fs/nfs/super.c +index 1ffce9076060..2d2238548a6e 100644 +--- a/fs/nfs/super.c ++++ b/fs/nfs/super.c +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -219,6 +220,7 @@ static int __nfs_list_for_each_server(struct list_head *head, + ret = fn(server, data); + if (ret) + goto out; ++ cond_resched(); + rcu_read_lock(); + } + rcu_read_unlock(); +-- +2.43.0 + diff --git a/queue-5.10/of-irq-prevent-device-address-out-of-bounds-read-in-.patch b/queue-5.10/of-irq-prevent-device-address-out-of-bounds-read-in-.patch new file mode 100644 index 00000000000..206a454dd47 --- /dev/null +++ b/queue-5.10/of-irq-prevent-device-address-out-of-bounds-read-in-.patch @@ -0,0 +1,131 @@ +From 6489b8bf6a177f3e9d9dbccb58b7fadb1eec553c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 12 Aug 2024 12:06:51 +0200 +Subject: of/irq: Prevent device address out-of-bounds read in interrupt map + walk + +From: Stefan Wiehler + +[ Upstream commit b739dffa5d570b411d4bdf4bb9b8dfd6b7d72305 ] + +When of_irq_parse_raw() is invoked with a device address smaller than +the interrupt parent node (from #address-cells property), KASAN detects +the following out-of-bounds read when populating the initial match table +(dyndbg="func of_irq_parse_* +p"): + + OF: of_irq_parse_one: dev=/soc@0/picasso/watchdog, index=0 + OF: parent=/soc@0/pci@878000000000/gpio0@17,0, intsize=2 + OF: intspec=4 + OF: of_irq_parse_raw: ipar=/soc@0/pci@878000000000/gpio0@17,0, size=2 + OF: -> addrsize=3 + ================================================================== + BUG: KASAN: slab-out-of-bounds in of_irq_parse_raw+0x2b8/0x8d0 + Read of size 4 at addr ffffff81beca5608 by task bash/764 + + CPU: 1 PID: 764 Comm: bash Tainted: G O 6.1.67-484c613561-nokia_sm_arm64 #1 + Hardware name: Unknown Unknown Product/Unknown Product, BIOS 2023.01-12.24.03-dirty 01/01/2023 + Call trace: + dump_backtrace+0xdc/0x130 + show_stack+0x1c/0x30 + dump_stack_lvl+0x6c/0x84 + print_report+0x150/0x448 + kasan_report+0x98/0x140 + __asan_load4+0x78/0xa0 + of_irq_parse_raw+0x2b8/0x8d0 + of_irq_parse_one+0x24c/0x270 + parse_interrupts+0xc0/0x120 + of_fwnode_add_links+0x100/0x2d0 + fw_devlink_parse_fwtree+0x64/0xc0 + device_add+0xb38/0xc30 + of_device_add+0x64/0x90 + of_platform_device_create_pdata+0xd0/0x170 + of_platform_bus_create+0x244/0x600 + of_platform_notify+0x1b0/0x254 + blocking_notifier_call_chain+0x9c/0xd0 + __of_changeset_entry_notify+0x1b8/0x230 + __of_changeset_apply_notify+0x54/0xe4 + of_overlay_fdt_apply+0xc04/0xd94 + ... + + The buggy address belongs to the object at ffffff81beca5600 + which belongs to the cache kmalloc-128 of size 128 + The buggy address is located 8 bytes inside of + 128-byte region [ffffff81beca5600, ffffff81beca5680) + + The buggy address belongs to the physical page: + page:00000000230d3d03 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x1beca4 + head:00000000230d3d03 order:1 compound_mapcount:0 compound_pincount:0 + flags: 0x8000000000010200(slab|head|zone=2) + raw: 8000000000010200 0000000000000000 dead000000000122 ffffff810000c300 + raw: 0000000000000000 0000000000200020 00000001ffffffff 0000000000000000 + page dumped because: kasan: bad access detected + + Memory state around the buggy address: + ffffff81beca5500: 04 fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + ffffff81beca5580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + >ffffff81beca5600: 00 fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + ^ + ffffff81beca5680: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + ffffff81beca5700: 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc + ================================================================== + OF: -> got it ! + +Prevent the out-of-bounds read by copying the device address into a +buffer of sufficient size. + +Signed-off-by: Stefan Wiehler +Link: https://lore.kernel.org/r/20240812100652.3800963-1-stefan.wiehler@nokia.com +Signed-off-by: Rob Herring (Arm) +Signed-off-by: Sasha Levin +--- + drivers/of/irq.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/drivers/of/irq.c b/drivers/of/irq.c +index 352e14b007e7..ad0cb49e233a 100644 +--- a/drivers/of/irq.c ++++ b/drivers/of/irq.c +@@ -288,7 +288,8 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar + struct device_node *p; + const __be32 *addr; + u32 intsize; +- int i, res; ++ int i, res, addr_len; ++ __be32 addr_buf[3] = { 0 }; + + pr_debug("of_irq_parse_one: dev=%pOF, index=%d\n", device, index); + +@@ -297,13 +298,19 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar + return of_irq_parse_oldworld(device, index, out_irq); + + /* Get the reg property (if any) */ +- addr = of_get_property(device, "reg", NULL); ++ addr = of_get_property(device, "reg", &addr_len); ++ ++ /* Prevent out-of-bounds read in case of longer interrupt parent address size */ ++ if (addr_len > (3 * sizeof(__be32))) ++ addr_len = 3 * sizeof(__be32); ++ if (addr) ++ memcpy(addr_buf, addr, addr_len); + + /* Try the new-style interrupts-extended first */ + res = of_parse_phandle_with_args(device, "interrupts-extended", + "#interrupt-cells", index, out_irq); + if (!res) +- return of_irq_parse_raw(addr, out_irq); ++ return of_irq_parse_raw(addr_buf, out_irq); + + /* Look for the interrupt parent. */ + p = of_irq_find_parent(device); +@@ -333,7 +340,7 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar + + + /* Check if there are any interrupt-map translations to process */ +- res = of_irq_parse_raw(addr, out_irq); ++ res = of_irq_parse_raw(addr_buf, out_irq); + out: + of_node_put(p); + return res; +-- +2.43.0 + diff --git a/queue-5.10/pci-add-missing-bridge-lock-to-pci_bus_lock.patch b/queue-5.10/pci-add-missing-bridge-lock-to-pci_bus_lock.patch new file mode 100644 index 00000000000..37e9b4a606f --- /dev/null +++ b/queue-5.10/pci-add-missing-bridge-lock-to-pci_bus_lock.patch @@ -0,0 +1,163 @@ +From 169d87b659766e88765fe08c1b5fed8d873db70a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 May 2024 18:04:35 -0700 +Subject: PCI: Add missing bridge lock to pci_bus_lock() + +From: Dan Williams + +[ Upstream commit a4e772898f8bf2e7e1cf661a12c60a5612c4afab ] + +One of the true positives that the cfg_access_lock lockdep effort +identified is this sequence: + + WARNING: CPU: 14 PID: 1 at drivers/pci/pci.c:4886 pci_bridge_secondary_bus_reset+0x5d/0x70 + RIP: 0010:pci_bridge_secondary_bus_reset+0x5d/0x70 + Call Trace: + + ? __warn+0x8c/0x190 + ? pci_bridge_secondary_bus_reset+0x5d/0x70 + ? report_bug+0x1f8/0x200 + ? handle_bug+0x3c/0x70 + ? exc_invalid_op+0x18/0x70 + ? asm_exc_invalid_op+0x1a/0x20 + ? pci_bridge_secondary_bus_reset+0x5d/0x70 + pci_reset_bus+0x1d8/0x270 + vmd_probe+0x778/0xa10 + pci_device_probe+0x95/0x120 + +Where pci_reset_bus() users are triggering unlocked secondary bus resets. +Ironically pci_bus_reset(), several calls down from pci_reset_bus(), uses +pci_bus_lock() before issuing the reset which locks everything *but* the +bridge itself. + +For the same motivation as adding: + + bridge = pci_upstream_bridge(dev); + if (bridge) + pci_dev_lock(bridge); + +to pci_reset_function() for the "bus" and "cxl_bus" reset cases, add +pci_dev_lock() for @bus->self to pci_bus_lock(). + +Link: https://lore.kernel.org/r/171711747501.1628941.15217746952476635316.stgit@dwillia2-xfh.jf.intel.com +Reported-by: Imre Deak +Closes: http://lore.kernel.org/r/6657833b3b5ae_14984b29437@dwillia2-xfh.jf.intel.com.notmuch +Signed-off-by: Dan Williams +Signed-off-by: Keith Busch +[bhelgaas: squash in recursive locking deadlock fix from Keith Busch: +https://lore.kernel.org/r/20240711193650.701834-1-kbusch@meta.com] +Signed-off-by: Bjorn Helgaas +Tested-by: Hans de Goede +Tested-by: Kalle Valo +Reviewed-by: Dave Jiang +Signed-off-by: Sasha Levin +--- + drivers/pci/pci.c | 35 +++++++++++++++++++++-------------- + 1 file changed, 21 insertions(+), 14 deletions(-) + +diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c +index 09d5fa637b98..800df0f1417d 100644 +--- a/drivers/pci/pci.c ++++ b/drivers/pci/pci.c +@@ -5260,10 +5260,12 @@ static void pci_bus_lock(struct pci_bus *bus) + { + struct pci_dev *dev; + ++ pci_dev_lock(bus->self); + list_for_each_entry(dev, &bus->devices, bus_list) { +- pci_dev_lock(dev); + if (dev->subordinate) + pci_bus_lock(dev->subordinate); ++ else ++ pci_dev_lock(dev); + } + } + +@@ -5275,8 +5277,10 @@ static void pci_bus_unlock(struct pci_bus *bus) + list_for_each_entry(dev, &bus->devices, bus_list) { + if (dev->subordinate) + pci_bus_unlock(dev->subordinate); +- pci_dev_unlock(dev); ++ else ++ pci_dev_unlock(dev); + } ++ pci_dev_unlock(bus->self); + } + + /* Return 1 on successful lock, 0 on contention */ +@@ -5284,15 +5288,15 @@ static int pci_bus_trylock(struct pci_bus *bus) + { + struct pci_dev *dev; + ++ if (!pci_dev_trylock(bus->self)) ++ return 0; ++ + list_for_each_entry(dev, &bus->devices, bus_list) { +- if (!pci_dev_trylock(dev)) +- goto unlock; + if (dev->subordinate) { +- if (!pci_bus_trylock(dev->subordinate)) { +- pci_dev_unlock(dev); ++ if (!pci_bus_trylock(dev->subordinate)) + goto unlock; +- } +- } ++ } else if (!pci_dev_trylock(dev)) ++ goto unlock; + } + return 1; + +@@ -5300,8 +5304,10 @@ static int pci_bus_trylock(struct pci_bus *bus) + list_for_each_entry_continue_reverse(dev, &bus->devices, bus_list) { + if (dev->subordinate) + pci_bus_unlock(dev->subordinate); +- pci_dev_unlock(dev); ++ else ++ pci_dev_unlock(dev); + } ++ pci_dev_unlock(bus->self); + return 0; + } + +@@ -5333,9 +5339,10 @@ static void pci_slot_lock(struct pci_slot *slot) + list_for_each_entry(dev, &slot->bus->devices, bus_list) { + if (!dev->slot || dev->slot != slot) + continue; +- pci_dev_lock(dev); + if (dev->subordinate) + pci_bus_lock(dev->subordinate); ++ else ++ pci_dev_lock(dev); + } + } + +@@ -5361,14 +5368,13 @@ static int pci_slot_trylock(struct pci_slot *slot) + list_for_each_entry(dev, &slot->bus->devices, bus_list) { + if (!dev->slot || dev->slot != slot) + continue; +- if (!pci_dev_trylock(dev)) +- goto unlock; + if (dev->subordinate) { + if (!pci_bus_trylock(dev->subordinate)) { + pci_dev_unlock(dev); + goto unlock; + } +- } ++ } else if (!pci_dev_trylock(dev)) ++ goto unlock; + } + return 1; + +@@ -5379,7 +5385,8 @@ static int pci_slot_trylock(struct pci_slot *slot) + continue; + if (dev->subordinate) + pci_bus_unlock(dev->subordinate); +- pci_dev_unlock(dev); ++ else ++ pci_dev_unlock(dev); + } + return 0; + } +-- +2.43.0 + diff --git a/queue-5.10/pci-hotplug-pnv_php-fix-hotplug-driver-crash-on-powe.patch b/queue-5.10/pci-hotplug-pnv_php-fix-hotplug-driver-crash-on-powe.patch new file mode 100644 index 00000000000..ebc8ca040f9 --- /dev/null +++ b/queue-5.10/pci-hotplug-pnv_php-fix-hotplug-driver-crash-on-powe.patch @@ -0,0 +1,58 @@ +From f48eb04000ca0df8908496c642d8cd74f0fd64aa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Jul 2024 13:15:06 +0530 +Subject: pci/hotplug/pnv_php: Fix hotplug driver crash on Powernv + +From: Krishna Kumar + +[ Upstream commit 335e35b748527f0c06ded9eebb65387f60647fda ] + +The hotplug driver for powerpc (pci/hotplug/pnv_php.c) causes a kernel +crash when we try to hot-unplug/disable the PCIe switch/bridge from +the PHB. + +The crash occurs because although the MSI data structure has been +released during disable/hot-unplug path and it has been assigned +with NULL, still during unregistration the code was again trying to +explicitly disable the MSI which causes the NULL pointer dereference and +kernel crash. + +The patch fixes the check during unregistration path to prevent invoking +pci_disable_msi/msix() since its data structure is already freed. + +Reported-by: Timothy Pearson +Closes: https://lore.kernel.org/all/1981605666.2142272.1703742465927.JavaMail.zimbra@raptorengineeringinc.com/ +Acked-by: Bjorn Helgaas +Tested-by: Shawn Anastasio +Signed-off-by: Krishna Kumar +Signed-off-by: Michael Ellerman +Link: https://msgid.link/20240701074513.94873-2-krishnak@linux.ibm.com +Signed-off-by: Sasha Levin +--- + drivers/pci/hotplug/pnv_php.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c +index 04565162a449..cf9c0e75f0be 100644 +--- a/drivers/pci/hotplug/pnv_php.c ++++ b/drivers/pci/hotplug/pnv_php.c +@@ -38,7 +38,6 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot, + bool disable_device) + { + struct pci_dev *pdev = php_slot->pdev; +- int irq = php_slot->irq; + u16 ctrl; + + if (php_slot->irq > 0) { +@@ -57,7 +56,7 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot, + php_slot->wq = NULL; + } + +- if (disable_device || irq > 0) { ++ if (disable_device) { + if (pdev->msix_enabled) + pci_disable_msix(pdev); + else if (pdev->msi_enabled) +-- +2.43.0 + diff --git a/queue-5.10/pci-keystone-add-workaround-for-errata-i2037-am65x-s.patch b/queue-5.10/pci-keystone-add-workaround-for-errata-i2037-am65x-s.patch new file mode 100644 index 00000000000..8d5446b9184 --- /dev/null +++ b/queue-5.10/pci-keystone-add-workaround-for-errata-i2037-am65x-s.patch @@ -0,0 +1,129 @@ +From f204c04bdc0b57cae55ff25d69dc701b83048bfa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 Jun 2024 13:45:29 +0200 +Subject: PCI: keystone: Add workaround for Errata #i2037 (AM65x SR 1.0) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Kishon Vijay Abraham I + +[ Upstream commit 86f271f22bbb6391410a07e08d6ca3757fda01fa ] + +Errata #i2037 in AM65x/DRA80xM Processors Silicon Revision 1.0 +(SPRZ452D_July 2018_Revised December 2019 [1]) mentions when an +inbound PCIe TLP spans more than two internal AXI 128-byte bursts, +the bus may corrupt the packet payload and the corrupt data may +cause associated applications or the processor to hang. + +The workaround for Errata #i2037 is to limit the maximum read +request size and maximum payload size to 128 bytes. Add workaround +for Errata #i2037 here. + +The errata and workaround is applicable only to AM65x SR 1.0 and +later versions of the silicon will have this fixed. + +[1] -> https://www.ti.com/lit/er/sprz452i/sprz452i.pdf + +Link: https://lore.kernel.org/linux-pci/16e1fcae-1ea7-46be-b157-096e05661b15@siemens.com +Signed-off-by: Kishon Vijay Abraham I +Signed-off-by: Achal Verma +Signed-off-by: Vignesh Raghavendra +Signed-off-by: Jan Kiszka +Signed-off-by: Krzysztof Wilczyński +Reviewed-by: Siddharth Vadapalli +Signed-off-by: Sasha Levin +--- + drivers/pci/controller/dwc/pci-keystone.c | 44 ++++++++++++++++++++++- + 1 file changed, 43 insertions(+), 1 deletion(-) + +diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c +index d3c3ca3ef4ba..0b49bdf149a6 100644 +--- a/drivers/pci/controller/dwc/pci-keystone.c ++++ b/drivers/pci/controller/dwc/pci-keystone.c +@@ -35,6 +35,11 @@ + #define PCIE_DEVICEID_SHIFT 16 + + /* Application registers */ ++#define PID 0x000 ++#define RTL GENMASK(15, 11) ++#define RTL_SHIFT 11 ++#define AM6_PCI_PG1_RTL_VER 0x15 ++ + #define CMD_STATUS 0x004 + #define LTSSM_EN_VAL BIT(0) + #define OB_XLAT_EN_VAL BIT(1) +@@ -105,6 +110,8 @@ + + #define to_keystone_pcie(x) dev_get_drvdata((x)->dev) + ++#define PCI_DEVICE_ID_TI_AM654X 0xb00c ++ + struct ks_pcie_of_data { + enum dw_pcie_device_mode mode; + const struct dw_pcie_host_ops *host_ops; +@@ -537,7 +544,11 @@ static int ks_pcie_start_link(struct dw_pcie *pci) + static void ks_pcie_quirk(struct pci_dev *dev) + { + struct pci_bus *bus = dev->bus; ++ struct keystone_pcie *ks_pcie; ++ struct device *bridge_dev; + struct pci_dev *bridge; ++ u32 val; ++ + static const struct pci_device_id rc_pci_devids[] = { + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCIE_RC_K2HK), + .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, +@@ -549,6 +560,11 @@ static void ks_pcie_quirk(struct pci_dev *dev) + .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, + { 0, }, + }; ++ static const struct pci_device_id am6_pci_devids[] = { ++ { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_AM654X), ++ .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, ++ { 0, }, ++ }; + + if (pci_is_root_bus(bus)) + bridge = dev; +@@ -570,10 +586,36 @@ static void ks_pcie_quirk(struct pci_dev *dev) + */ + if (pci_match_id(rc_pci_devids, bridge)) { + if (pcie_get_readrq(dev) > 256) { +- dev_info(&dev->dev, "limiting MRRS to 256\n"); ++ dev_info(&dev->dev, "limiting MRRS to 256 bytes\n"); + pcie_set_readrq(dev, 256); + } + } ++ ++ /* ++ * Memory transactions fail with PCI controller in AM654 PG1.0 ++ * when MRRS is set to more than 128 bytes. Force the MRRS to ++ * 128 bytes in all downstream devices. ++ */ ++ if (pci_match_id(am6_pci_devids, bridge)) { ++ bridge_dev = pci_get_host_bridge_device(dev); ++ if (!bridge_dev && !bridge_dev->parent) ++ return; ++ ++ ks_pcie = dev_get_drvdata(bridge_dev->parent); ++ if (!ks_pcie) ++ return; ++ ++ val = ks_pcie_app_readl(ks_pcie, PID); ++ val &= RTL; ++ val >>= RTL_SHIFT; ++ if (val != AM6_PCI_PG1_RTL_VER) ++ return; ++ ++ if (pcie_get_readrq(dev) > 128) { ++ dev_info(&dev->dev, "limiting MRRS to 128 bytes\n"); ++ pcie_set_readrq(dev, 128); ++ } ++ } + } + DECLARE_PCI_FIXUP_ENABLE(PCI_ANY_ID, PCI_ANY_ID, ks_pcie_quirk); + +-- +2.43.0 + diff --git a/queue-5.10/pcmcia-use-resource_size-function-on-resource-object.patch b/queue-5.10/pcmcia-use-resource_size-function-on-resource-object.patch new file mode 100644 index 00000000000..3fd92e7dde5 --- /dev/null +++ b/queue-5.10/pcmcia-use-resource_size-function-on-resource-object.patch @@ -0,0 +1,46 @@ +From 87cb76292eed81c789f44af58d25958b08943f81 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 12 May 2024 23:31:21 +0100 +Subject: pcmcia: Use resource_size function on resource object + +From: Jules Irenge + +[ Upstream commit 24a025497e7e883bd2adef5d0ece1e9b9268009f ] + +Cocinnele reports a warning + +WARNING: Suspicious code. resource_size is maybe missing with root + +The root cause is the function resource_size is not used when needed + +Use resource_size() on variable "root" of type resource + +Signed-off-by: Jules Irenge +Signed-off-by: Dominik Brodowski +Signed-off-by: Sasha Levin +--- + drivers/pcmcia/yenta_socket.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c +index 84bfc0e85d6b..f15b72c6e57e 100644 +--- a/drivers/pcmcia/yenta_socket.c ++++ b/drivers/pcmcia/yenta_socket.c +@@ -636,11 +636,11 @@ static int yenta_search_one_res(struct resource *root, struct resource *res, + start = PCIBIOS_MIN_CARDBUS_IO; + end = ~0U; + } else { +- unsigned long avail = root->end - root->start; ++ unsigned long avail = resource_size(root); + int i; + size = BRIDGE_MEM_MAX; +- if (size > avail/8) { +- size = (avail+1)/8; ++ if (size > (avail - 1) / 8) { ++ size = avail / 8; + /* round size down to next power of 2 */ + i = 0; + while ((size /= 2) != 0) +-- +2.43.0 + diff --git a/queue-5.10/platform-x86-dell-smbios-fix-error-path-in-dell_smbi.patch b/queue-5.10/platform-x86-dell-smbios-fix-error-path-in-dell_smbi.patch new file mode 100644 index 00000000000..ba635867af6 --- /dev/null +++ b/queue-5.10/platform-x86-dell-smbios-fix-error-path-in-dell_smbi.patch @@ -0,0 +1,54 @@ +From be521a83c929caa150853c84624e9fc93bc93e75 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 30 Aug 2024 09:54:28 +0300 +Subject: platform/x86: dell-smbios: Fix error path in dell_smbios_init() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Aleksandr Mishin + +[ Upstream commit ffc17e1479e8e9459b7afa80e5d9d40d0dd78abb ] + +In case of error in build_tokens_sysfs(), all the memory that has been +allocated is freed at end of this function. But then free_group() is +called which performs memory deallocation again. + +Also, instead of free_group() call, there should be exit_dell_smbios_smm() +and exit_dell_smbios_wmi() calls, since there is initialization, but there +is no release of resources in case of an error. + +Fix these issues by replacing free_group() call with +exit_dell_smbios_wmi() and exit_dell_smbios_smm(). + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Fixes: 33b9ca1e53b4 ("platform/x86: dell-smbios: Add a sysfs interface for SMBIOS tokens") +Signed-off-by: Aleksandr Mishin +Link: https://lore.kernel.org/r/20240830065428.9544-1-amishin@t-argos.ru +Reviewed-by: Ilpo Järvinen +Signed-off-by: Ilpo Järvinen +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/dell-smbios-base.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/platform/x86/dell-smbios-base.c b/drivers/platform/x86/dell-smbios-base.c +index 3a1dbf199441..98e77cb210b7 100644 +--- a/drivers/platform/x86/dell-smbios-base.c ++++ b/drivers/platform/x86/dell-smbios-base.c +@@ -610,7 +610,10 @@ static int __init dell_smbios_init(void) + return 0; + + fail_sysfs: +- free_group(platform_device); ++ if (!wmi) ++ exit_dell_smbios_wmi(); ++ if (!smm) ++ exit_dell_smbios_smm(); + + fail_create_group: + platform_device_del(platform_device); +-- +2.43.0 + diff --git a/queue-5.10/s390-vmlinux.lds.s-move-ro_after_init-section-behind.patch b/queue-5.10/s390-vmlinux.lds.s-move-ro_after_init-section-behind.patch new file mode 100644 index 00000000000..52cf3b5210c --- /dev/null +++ b/queue-5.10/s390-vmlinux.lds.s-move-ro_after_init-section-behind.patch @@ -0,0 +1,75 @@ +From a4e76454f7d804a868624f76573d9ff72b067990 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jul 2024 13:06:43 +0200 +Subject: s390/vmlinux.lds.S: Move ro_after_init section behind rodata section + +From: Heiko Carstens + +[ Upstream commit 75c10d5377d8821efafed32e4d72068d9c1f8ec0 ] + +The .data.rel.ro and .got section were added between the rodata and +ro_after_init data section, which adds an RW mapping in between all RO +mapping of the kernel image: + +---[ Kernel Image Start ]--- +0x000003ffe0000000-0x000003ffe0e00000 14M PMD RO X +0x000003ffe0e00000-0x000003ffe0ec7000 796K PTE RO X +0x000003ffe0ec7000-0x000003ffe0f00000 228K PTE RO NX +0x000003ffe0f00000-0x000003ffe1300000 4M PMD RO NX +0x000003ffe1300000-0x000003ffe1331000 196K PTE RO NX +0x000003ffe1331000-0x000003ffe13b3000 520K PTE RW NX <--- +0x000003ffe13b3000-0x000003ffe13d5000 136K PTE RO NX +0x000003ffe13d5000-0x000003ffe1400000 172K PTE RW NX +0x000003ffe1400000-0x000003ffe1500000 1M PMD RW NX +0x000003ffe1500000-0x000003ffe1700000 2M PTE RW NX +0x000003ffe1700000-0x000003ffe1800000 1M PMD RW NX +0x000003ffe1800000-0x000003ffe187e000 504K PTE RW NX +---[ Kernel Image End ]--- + +Move the ro_after_init data section again right behind the rodata +section to prevent interleaving RO and RW mappings: + +---[ Kernel Image Start ]--- +0x000003ffe0000000-0x000003ffe0e00000 14M PMD RO X +0x000003ffe0e00000-0x000003ffe0ec7000 796K PTE RO X +0x000003ffe0ec7000-0x000003ffe0f00000 228K PTE RO NX +0x000003ffe0f00000-0x000003ffe1300000 4M PMD RO NX +0x000003ffe1300000-0x000003ffe1353000 332K PTE RO NX +0x000003ffe1353000-0x000003ffe1400000 692K PTE RW NX +0x000003ffe1400000-0x000003ffe1500000 1M PMD RW NX +0x000003ffe1500000-0x000003ffe1700000 2M PTE RW NX +0x000003ffe1700000-0x000003ffe1800000 1M PMD RW NX +0x000003ffe1800000-0x000003ffe187e000 504K PTE RW NX +---[ Kernel Image End ]--- + +Reviewed-by: Alexander Gordeev +Signed-off-by: Heiko Carstens +Signed-off-by: Vasily Gorbik +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/vmlinux.lds.S | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S +index 1c65c38ec9a3..c4bf95371f49 100644 +--- a/arch/s390/kernel/vmlinux.lds.S ++++ b/arch/s390/kernel/vmlinux.lds.S +@@ -69,6 +69,15 @@ SECTIONS + . = ALIGN(PAGE_SIZE); + __end_ro_after_init = .; + ++ .data.rel.ro : { ++ *(.data.rel.ro .data.rel.ro.*) ++ } ++ .got : { ++ __got_start = .; ++ *(.got) ++ __got_end = .; ++ } ++ + RW_DATA(0x100, PAGE_SIZE, THREAD_SIZE) + BOOT_DATA_PRESERVED + +-- +2.43.0 + diff --git a/queue-5.10/series b/queue-5.10/series index 4db79c363a3..352e078d7d7 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -95,3 +95,65 @@ nfsd-expose-proc-net-sunrpc-nfsd-in-net-namespaces.patch nfsd-make-all-of-the-nfsd-stats-per-network-namespace.patch nfsd-remove-nfsd_stats-make-th_cnt-a-global-counter.patch nfsd-make-svc_stat-per-network-namespace-instead-of-global.patch +alsa-hda-add-input-value-sanity-checks-to-hdmi-chann.patch +smack-unix-sockets-fix-accept-ed-socket-label.patch +irqchip-armada-370-xp-do-not-allow-mapping-irq-0-and.patch +af_unix-remove-put_pid-put_cred-in-copy_peercred.patch +iommu-sun50i-clear-bypass-register.patch +netfilter-nf_conncount-fix-wrong-variable-type.patch +udf-avoid-excessive-partition-lengths.patch +media-vivid-fix-wrong-sizeimage-value-for-mplane.patch +leds-spi-byte-call-of_node_put-on-error-path.patch +wifi-brcmsmac-advertise-mfp_capable-to-enable-wpa3.patch +usb-uas-set-host-status-byte-on-data-completion-erro.patch +media-vivid-don-t-set-hdmi-tx-controls-if-there-are-.patch +pci-keystone-add-workaround-for-errata-i2037-am65x-s.patch +media-qcom-camss-add-check-for-v4l2_fwnode_endpoint_.patch +pcmcia-use-resource_size-function-on-resource-object.patch +can-bcm-remove-proc-entry-when-dev-is-unregistered.patch +igb-fix-not-clearing-timesync-interrupts-for-82580.patch +svcrdma-catch-another-reply-chunk-overflow-case.patch +platform-x86-dell-smbios-fix-error-path-in-dell_smbi.patch +tcp_bpf-fix-return-value-of-tcp_bpf_sendmsg.patch-1053 +igc-unlock-on-error-in-igc_io_resume.patch +drivers-net-usb-remove-all-strcpy-uses.patch +net-usb-don-t-write-directly-to-netdev-dev_addr.patch +usbnet-modern-method-to-get-random-mac.patch +bareudp-fix-device-stats-updates.patch +fou-remove-sparse-errors.patch +gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_re.patch +gro-remove-rcu_read_lock-rcu_read_unlock-from-gro_co.patch +fou-fix-null-ptr-deref-in-gro.patch +net-bridge-br_fdb_external_learn_add-always-set-ext_.patch +net-dsa-vsc73xx-fix-possible-subblocks-range-of-capt.patch +asoc-topology-properly-initialize-soc_enum-values.patch +dm-init-handle-minors-larger-than-255.patch +iommu-vt-d-handle-volatile-descriptor-status-read.patch +cgroup-protect-css-cgroup-write-under-css_set_lock.patch +um-line-always-fill-error_out-in-setup_one_line.patch +devres-initialize-an-uninitialized-struct-member.patch +pci-hotplug-pnv_php-fix-hotplug-driver-crash-on-powe.patch +hwmon-adc128d818-fix-underflows-seen-when-writing-li.patch +hwmon-lm95234-fix-underflows-seen-when-writing-limit.patch +hwmon-nct6775-core-fix-underflows-seen-when-writing-.patch +hwmon-w83627ehf-fix-underflows-seen-when-writing-lim.patch +libbpf-add-null-checks-to-bpf_object__-prev_map-next.patch +wifi-mwifiex-do-not-return-unused-priv-in-mwifiex_ge.patch +smp-add-missing-destroy_work_on_stack-call-in-smp_ca.patch +btrfs-replace-bug_on-with-assert-in-walk_down_proc.patch +btrfs-clean-up-our-handling-of-refs-0-in-snapshot-de.patch +pci-add-missing-bridge-lock-to-pci_bus_lock.patch +net-dpaa-avoid-on-stack-arrays-of-nr_cpus-elements.patch +irqchip-gic-v4-always-configure-affinity-on-vpe-acti.patch +kselftests-dmabuf-heaps-ensure-the-driver-name-is-nu.patch +btrfs-initialize-location-to-fix-wmaybe-uninitialize.patch +s390-vmlinux.lds.s-move-ro_after_init-section-behind.patch +hid-cougar-fix-slab-out-of-bounds-read-in-cougar_rep.patch +input-uinput-reject-requests-with-unreasonable-numbe.patch +usbnet-ipheth-race-between-ipheth_close-and-error-ha.patch +squashfs-sanity-check-symbolic-link-size.patch +of-irq-prevent-device-address-out-of-bounds-read-in-.patch +lib-generic-radix-tree.c-fix-rare-race-in-__genradix.patch +mips-cevt-r4k-don-t-call-get_c0_compare_int-if-timer.patch +ata-pata_macio-use-warn-instead-of-bug.patch +nfsv4-add-missing-rescheduling-points-in-nfs_client_.patch diff --git a/queue-5.10/smack-unix-sockets-fix-accept-ed-socket-label.patch b/queue-5.10/smack-unix-sockets-fix-accept-ed-socket-label.patch new file mode 100644 index 00000000000..06d8e0161a4 --- /dev/null +++ b/queue-5.10/smack-unix-sockets-fix-accept-ed-socket-label.patch @@ -0,0 +1,60 @@ +From 0ec7be6ad2e82f983346cb8386464c7a770fc11a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 Jun 2024 01:44:30 +0300 +Subject: smack: unix sockets: fix accept()ed socket label + +From: Konstantin Andreev + +[ Upstream commit e86cac0acdb1a74f608bacefe702f2034133a047 ] + +When a process accept()s connection from a unix socket +(either stream or seqpacket) +it gets the socket with the label of the connecting process. + +For example, if a connecting process has a label 'foo', +the accept()ed socket will also have 'in' and 'out' labels 'foo', +regardless of the label of the listener process. + +This is because kernel creates unix child sockets +in the context of the connecting process. + +I do not see any obvious way for the listener to abuse +alien labels coming with the new socket, but, +to be on the safe side, it's better fix new socket labels. + +Signed-off-by: Konstantin Andreev +Signed-off-by: Casey Schaufler +Signed-off-by: Sasha Levin +--- + security/smack/smack_lsm.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c +index 88bcda1f07bf..92bc6c9d793d 100644 +--- a/security/smack/smack_lsm.c ++++ b/security/smack/smack_lsm.c +@@ -3642,12 +3642,18 @@ static int smack_unix_stream_connect(struct sock *sock, + } + } + +- /* +- * Cross reference the peer labels for SO_PEERSEC. +- */ + if (rc == 0) { ++ /* ++ * Cross reference the peer labels for SO_PEERSEC. ++ */ + nsp->smk_packet = ssp->smk_out; + ssp->smk_packet = osp->smk_out; ++ ++ /* ++ * new/child/established socket must inherit listening socket labels ++ */ ++ nsp->smk_out = osp->smk_out; ++ nsp->smk_in = osp->smk_in; + } + + return rc; +-- +2.43.0 + diff --git a/queue-5.10/smp-add-missing-destroy_work_on_stack-call-in-smp_ca.patch b/queue-5.10/smp-add-missing-destroy_work_on_stack-call-in-smp_ca.patch new file mode 100644 index 00000000000..ed62c5ad1be --- /dev/null +++ b/queue-5.10/smp-add-missing-destroy_work_on_stack-call-in-smp_ca.patch @@ -0,0 +1,45 @@ +From 5922a2f905f15e2a0331f753db682bc5a5794503 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jul 2024 14:52:13 +0800 +Subject: smp: Add missing destroy_work_on_stack() call in smp_call_on_cpu() + +From: Zqiang + +[ Upstream commit 77aeb1b685f9db73d276bad4bb30d48505a6fd23 ] + +For CONFIG_DEBUG_OBJECTS_WORK=y kernels sscs.work defined by +INIT_WORK_ONSTACK() is initialized by debug_object_init_on_stack() for +the debug check in __init_work() to work correctly. + +But this lacks the counterpart to remove the tracked object from debug +objects again, which will cause a debug object warning once the stack is +freed. + +Add the missing destroy_work_on_stack() invocation to cure that. + +[ tglx: Massaged changelog ] + +Signed-off-by: Zqiang +Signed-off-by: Thomas Gleixner +Tested-by: Paul E. McKenney +Link: https://lore.kernel.org/r/20240704065213.13559-1-qiang.zhang1211@gmail.com +Signed-off-by: Sasha Levin +--- + kernel/smp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kernel/smp.c b/kernel/smp.c +index b0684b4c111e..c6b3ad79c72b 100644 +--- a/kernel/smp.c ++++ b/kernel/smp.c +@@ -1009,6 +1009,7 @@ int smp_call_on_cpu(unsigned int cpu, int (*func)(void *), void *par, bool phys) + + queue_work_on(cpu, system_wq, &sscs.work); + wait_for_completion(&sscs.done); ++ destroy_work_on_stack(&sscs.work); + + return sscs.ret; + } +-- +2.43.0 + diff --git a/queue-5.10/squashfs-sanity-check-symbolic-link-size.patch b/queue-5.10/squashfs-sanity-check-symbolic-link-size.patch new file mode 100644 index 00000000000..42a09579c00 --- /dev/null +++ b/queue-5.10/squashfs-sanity-check-symbolic-link-size.patch @@ -0,0 +1,68 @@ +From b7769eae32ed03dc420b1a28e501349b6593c38e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 12 Aug 2024 00:28:21 +0100 +Subject: Squashfs: sanity check symbolic link size + +From: Phillip Lougher + +[ Upstream commit 810ee43d9cd245d138a2733d87a24858a23f577d ] + +Syzkiller reports a "KMSAN: uninit-value in pick_link" bug. + +This is caused by an uninitialised page, which is ultimately caused +by a corrupted symbolic link size read from disk. + +The reason why the corrupted symlink size causes an uninitialised +page is due to the following sequence of events: + +1. squashfs_read_inode() is called to read the symbolic + link from disk. This assigns the corrupted value + 3875536935 to inode->i_size. + +2. Later squashfs_symlink_read_folio() is called, which assigns + this corrupted value to the length variable, which being a + signed int, overflows producing a negative number. + +3. The following loop that fills in the page contents checks that + the copied bytes is less than length, which being negative means + the loop is skipped, producing an uninitialised page. + +This patch adds a sanity check which checks that the symbolic +link size is not larger than expected. + +-- + +Signed-off-by: Phillip Lougher +Link: https://lore.kernel.org/r/20240811232821.13903-1-phillip@squashfs.org.uk +Reported-by: Lizhi Xu +Reported-by: syzbot+24ac24ff58dc5b0d26b9@syzkaller.appspotmail.com +Closes: https://lore.kernel.org/all/000000000000a90e8c061e86a76b@google.com/ +V2: fix spelling mistake. +Signed-off-by: Christian Brauner +Signed-off-by: Sasha Levin +--- + fs/squashfs/inode.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c +index 24463145b351..f31649080a88 100644 +--- a/fs/squashfs/inode.c ++++ b/fs/squashfs/inode.c +@@ -276,8 +276,13 @@ int squashfs_read_inode(struct inode *inode, long long ino) + if (err < 0) + goto failed_read; + +- set_nlink(inode, le32_to_cpu(sqsh_ino->nlink)); + inode->i_size = le32_to_cpu(sqsh_ino->symlink_size); ++ if (inode->i_size > PAGE_SIZE) { ++ ERROR("Corrupted symlink\n"); ++ return -EINVAL; ++ } ++ ++ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink)); + inode->i_op = &squashfs_symlink_inode_ops; + inode_nohighmem(inode); + inode->i_data.a_ops = &squashfs_symlink_aops; +-- +2.43.0 + diff --git a/queue-5.10/svcrdma-catch-another-reply-chunk-overflow-case.patch b/queue-5.10/svcrdma-catch-another-reply-chunk-overflow-case.patch new file mode 100644 index 00000000000..067b556ddbd --- /dev/null +++ b/queue-5.10/svcrdma-catch-another-reply-chunk-overflow-case.patch @@ -0,0 +1,36 @@ +From d08d27cd6f96a7f8c19ae4f586f0dc6163afa9b5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 12 Nov 2020 14:47:14 -0500 +Subject: svcrdma: Catch another Reply chunk overflow case + +From: Chuck Lever + +[ Upstream commit e5decb2eb5f4d1f64ba9196b4bad0e26a441c81c ] + +When space in the Reply chunk runs out in the middle of a segment, +we end up passing a zero-length SGL to rdma_rw_ctx_init(), and it +oopses. + +Signed-off-by: Chuck Lever +Stable-dep-of: ffc17e1479e8 ("platform/x86: dell-smbios: Fix error path in dell_smbios_init()") +Signed-off-by: Sasha Levin +--- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c +index 80a0c0e87590..7c50eddb8d3c 100644 +--- a/net/sunrpc/xprtrdma/svc_rdma_rw.c ++++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c +@@ -460,6 +460,8 @@ svc_rdma_build_writes(struct svc_rdma_write_info *info, + offset += info->wi_seg_off; + + write_len = min(remaining, length - info->wi_seg_off); ++ if (!write_len) ++ goto out_overflow; + ctxt = svc_rdma_get_rw_ctxt(rdma, + (write_len >> PAGE_SHIFT) + 2); + if (!ctxt) +-- +2.43.0 + diff --git a/queue-5.10/tcp_bpf-fix-return-value-of-tcp_bpf_sendmsg.patch-1053 b/queue-5.10/tcp_bpf-fix-return-value-of-tcp_bpf_sendmsg.patch-1053 new file mode 100644 index 00000000000..6c4f335bea5 --- /dev/null +++ b/queue-5.10/tcp_bpf-fix-return-value-of-tcp_bpf_sendmsg.patch-1053 @@ -0,0 +1,96 @@ +From 330d30c7ae81a201ead81663c3d9ca8daa9a471d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 20 Aug 2024 20:07:44 -0700 +Subject: tcp_bpf: fix return value of tcp_bpf_sendmsg() + +From: Cong Wang + +[ Upstream commit fe1910f9337bd46a9343967b547ccab26b4b2c6e ] + +When we cork messages in psock->cork, the last message triggers the +flushing will result in sending a sk_msg larger than the current +message size. In this case, in tcp_bpf_send_verdict(), 'copied' becomes +negative at least in the following case: + +468 case __SK_DROP: +469 default: +470 sk_msg_free_partial(sk, msg, tosend); +471 sk_msg_apply_bytes(psock, tosend); +472 *copied -= (tosend + delta); // <==== HERE +473 return -EACCES; + +Therefore, it could lead to the following BUG with a proper value of +'copied' (thanks to syzbot). We should not use negative 'copied' as a +return value here. + + ------------[ cut here ]------------ + kernel BUG at net/socket.c:733! + Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP + Modules linked in: + CPU: 0 UID: 0 PID: 3265 Comm: syz-executor510 Not tainted 6.11.0-rc3-syzkaller-00060-gd07b43284ab3 #0 + Hardware name: linux,dummy-virt (DT) + pstate: 61400009 (nZCv daif +PAN -UAO -TCO +DIT -SSBS BTYPE=--) + pc : sock_sendmsg_nosec net/socket.c:733 [inline] + pc : sock_sendmsg_nosec net/socket.c:728 [inline] + pc : __sock_sendmsg+0x5c/0x60 net/socket.c:745 + lr : sock_sendmsg_nosec net/socket.c:730 [inline] + lr : __sock_sendmsg+0x54/0x60 net/socket.c:745 + sp : ffff800088ea3b30 + x29: ffff800088ea3b30 x28: fbf00000062bc900 x27: 0000000000000000 + x26: ffff800088ea3bc0 x25: ffff800088ea3bc0 x24: 0000000000000000 + x23: f9f00000048dc000 x22: 0000000000000000 x21: ffff800088ea3d90 + x20: f9f00000048dc000 x19: ffff800088ea3d90 x18: 0000000000000001 + x17: 0000000000000000 x16: 0000000000000000 x15: 000000002002ffaf + x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000 + x11: 0000000000000000 x10: ffff8000815849c0 x9 : ffff8000815b49c0 + x8 : 0000000000000000 x7 : 000000000000003f x6 : 0000000000000000 + x5 : 00000000000007e0 x4 : fff07ffffd239000 x3 : fbf00000062bc900 + x2 : 0000000000000000 x1 : 0000000000000000 x0 : 00000000fffffdef + Call trace: + sock_sendmsg_nosec net/socket.c:733 [inline] + __sock_sendmsg+0x5c/0x60 net/socket.c:745 + ____sys_sendmsg+0x274/0x2ac net/socket.c:2597 + ___sys_sendmsg+0xac/0x100 net/socket.c:2651 + __sys_sendmsg+0x84/0xe0 net/socket.c:2680 + __do_sys_sendmsg net/socket.c:2689 [inline] + __se_sys_sendmsg net/socket.c:2687 [inline] + __arm64_sys_sendmsg+0x24/0x30 net/socket.c:2687 + __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] + invoke_syscall+0x48/0x110 arch/arm64/kernel/syscall.c:49 + el0_svc_common.constprop.0+0x40/0xe0 arch/arm64/kernel/syscall.c:132 + do_el0_svc+0x1c/0x28 arch/arm64/kernel/syscall.c:151 + el0_svc+0x34/0xec arch/arm64/kernel/entry-common.c:712 + el0t_64_sync_handler+0x100/0x12c arch/arm64/kernel/entry-common.c:730 + el0t_64_sync+0x19c/0x1a0 arch/arm64/kernel/entry.S:598 + Code: f9404463 d63f0060 3108441f 54fffe81 (d4210000) + ---[ end trace 0000000000000000 ]--- + +Fixes: 4f738adba30a ("bpf: create tcp_bpf_ulp allowing BPF to monitor socket TX/RX data") +Reported-by: syzbot+58c03971700330ce14d8@syzkaller.appspotmail.com +Cc: Jakub Sitnicki +Signed-off-by: Cong Wang +Reviewed-by: John Fastabend +Acked-by: Martin KaFai Lau +Link: https://patch.msgid.link/20240821030744.320934-1-xiyou.wangcong@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/tcp_bpf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c +index c57ff6be899d..111f51a1efb3 100644 +--- a/net/ipv4/tcp_bpf.c ++++ b/net/ipv4/tcp_bpf.c +@@ -511,7 +511,7 @@ static int tcp_bpf_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) + err = sk_stream_error(sk, msg->msg_flags, err); + release_sock(sk); + sk_psock_put(sk, psock); +- return copied ? copied : err; ++ return copied > 0 ? copied : err; + } + + static int tcp_bpf_sendpage(struct sock *sk, struct page *page, int offset, +-- +2.43.0 + diff --git a/queue-5.10/udf-avoid-excessive-partition-lengths.patch b/queue-5.10/udf-avoid-excessive-partition-lengths.patch new file mode 100644 index 00000000000..499874ffc71 --- /dev/null +++ b/queue-5.10/udf-avoid-excessive-partition-lengths.patch @@ -0,0 +1,63 @@ +From ec9d10887320b34c0f7047d295ba8d224cbf9917 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Jun 2024 12:52:17 +0200 +Subject: udf: Avoid excessive partition lengths + +From: Jan Kara + +[ Upstream commit ebbe26fd54a9621994bc16b14f2ba8f84c089693 ] + +Avoid mounting filesystems where the partition would overflow the +32-bits used for block number. Also refuse to mount filesystems where +the partition length is so large we cannot safely index bits in a +block bitmap. + +Link: https://patch.msgid.link/20240620130403.14731-1-jack@suse.cz +Signed-off-by: Jan Kara +Signed-off-by: Sasha Levin +--- + fs/udf/super.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/udf/super.c b/fs/udf/super.c +index 5d79e5d2e158..ae75df43d51c 100644 +--- a/fs/udf/super.c ++++ b/fs/udf/super.c +@@ -1083,12 +1083,19 @@ static int udf_fill_partdesc_info(struct super_block *sb, + struct udf_part_map *map; + struct udf_sb_info *sbi = UDF_SB(sb); + struct partitionHeaderDesc *phd; ++ u32 sum; + int err; + + map = &sbi->s_partmaps[p_index]; + + map->s_partition_len = le32_to_cpu(p->partitionLength); /* blocks */ + map->s_partition_root = le32_to_cpu(p->partitionStartingLocation); ++ if (check_add_overflow(map->s_partition_root, map->s_partition_len, ++ &sum)) { ++ udf_err(sb, "Partition %d has invalid location %u + %u\n", ++ p_index, map->s_partition_root, map->s_partition_len); ++ return -EFSCORRUPTED; ++ } + + if (p->accessType == cpu_to_le32(PD_ACCESS_TYPE_READ_ONLY)) + map->s_partition_flags |= UDF_PART_FLAG_READ_ONLY; +@@ -1144,6 +1151,14 @@ static int udf_fill_partdesc_info(struct super_block *sb, + bitmap->s_extPosition = le32_to_cpu( + phd->unallocSpaceBitmap.extPosition); + map->s_partition_flags |= UDF_PART_FLAG_UNALLOC_BITMAP; ++ /* Check whether math over bitmap won't overflow. */ ++ if (check_add_overflow(map->s_partition_len, ++ sizeof(struct spaceBitmapDesc) << 3, ++ &sum)) { ++ udf_err(sb, "Partition %d is too long (%u)\n", p_index, ++ map->s_partition_len); ++ return -EFSCORRUPTED; ++ } + udf_debug("unallocSpaceBitmap (part %d) @ %u\n", + p_index, bitmap->s_extPosition); + } +-- +2.43.0 + diff --git a/queue-5.10/um-line-always-fill-error_out-in-setup_one_line.patch b/queue-5.10/um-line-always-fill-error_out-in-setup_one_line.patch new file mode 100644 index 00000000000..dcadcb64365 --- /dev/null +++ b/queue-5.10/um-line-always-fill-error_out-in-setup_one_line.patch @@ -0,0 +1,44 @@ +From 099c0536f6913bbebc048658f684fdcb90d0b908 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jul 2024 17:22:36 +0200 +Subject: um: line: always fill *error_out in setup_one_line() + +From: Johannes Berg + +[ Upstream commit 824ac4a5edd3f7494ab1996826c4f47f8ef0f63d ] + +The pointer isn't initialized by callers, but I have +encountered cases where it's still printed; initialize +it in all possible cases in setup_one_line(). + +Link: https://patch.msgid.link/20240703172235.ad863568b55f.Iaa1eba4db8265d7715ba71d5f6bb8c7ff63d27e9@changeid +Acked-By: Anton Ivanov +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + arch/um/drivers/line.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c +index 37e96ba0f5fb..d2beb4a497a2 100644 +--- a/arch/um/drivers/line.c ++++ b/arch/um/drivers/line.c +@@ -378,6 +378,7 @@ int setup_one_line(struct line *lines, int n, char *init, + parse_chan_pair(NULL, line, n, opts, error_out); + err = 0; + } ++ *error_out = "configured as 'none'"; + } else { + char *new = kstrdup(init, GFP_KERNEL); + if (!new) { +@@ -401,6 +402,7 @@ int setup_one_line(struct line *lines, int n, char *init, + } + } + if (err) { ++ *error_out = "failed to parse channel pair"; + line->init_str = NULL; + line->valid = 0; + kfree(new); +-- +2.43.0 + diff --git a/queue-5.10/usb-uas-set-host-status-byte-on-data-completion-erro.patch b/queue-5.10/usb-uas-set-host-status-byte-on-data-completion-erro.patch new file mode 100644 index 00000000000..62b95c1cea3 --- /dev/null +++ b/queue-5.10/usb-uas-set-host-status-byte-on-data-completion-erro.patch @@ -0,0 +1,41 @@ +From ef4291c7824aa25e314e0b807daeab31d6823fd2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Jun 2024 23:32:57 -0400 +Subject: usb: uas: set host status byte on data completion error + +From: Shantanu Goel + +[ Upstream commit 9d32685a251a754f1823d287df233716aa23bcb9 ] + +Set the host status byte when a data completion error is encountered +otherwise the upper layer may end up using the invalid zero'ed data. +The following output was observed from scsi/sd.c prior to this fix. + +[ 11.872824] sd 0:0:0:1: [sdf] tag#9 data cmplt err -75 uas-tag 1 inflight: +[ 11.872826] sd 0:0:0:1: [sdf] tag#9 CDB: Read capacity(16) 9e 10 00 00 00 00 00 00 00 00 00 00 00 20 00 00 +[ 11.872830] sd 0:0:0:1: [sdf] Sector size 0 reported, assuming 512. + +Signed-off-by: Shantanu Goel +Acked-by: Oliver Neukum +Link: https://lore.kernel.org/r/87msnx4ec6.fsf@yahoo.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/storage/uas.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c +index ff6f41e7e068..ea1680c4cc06 100644 +--- a/drivers/usb/storage/uas.c ++++ b/drivers/usb/storage/uas.c +@@ -424,6 +424,7 @@ static void uas_data_cmplt(struct urb *urb) + uas_log_cmd_state(cmnd, "data cmplt err", status); + /* error: no data transfered */ + scsi_set_resid(cmnd, sdb->length); ++ set_host_byte(cmnd, DID_ERROR); + } else { + scsi_set_resid(cmnd, sdb->length - urb->actual_length); + } +-- +2.43.0 + diff --git a/queue-5.10/usbnet-ipheth-race-between-ipheth_close-and-error-ha.patch b/queue-5.10/usbnet-ipheth-race-between-ipheth_close-and-error-ha.patch new file mode 100644 index 00000000000..4d5635acfc2 --- /dev/null +++ b/queue-5.10/usbnet-ipheth-race-between-ipheth_close-and-error-ha.patch @@ -0,0 +1,44 @@ +From 05cca4bd84b8eaa7829c615b5a1b0c29d550a7df Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 6 Aug 2024 19:28:05 +0200 +Subject: usbnet: ipheth: race between ipheth_close and error handling + +From: Oliver Neukum + +[ Upstream commit e5876b088ba03a62124266fa20d00e65533c7269 ] + +ipheth_sndbulk_callback() can submit carrier_work +as a part of its error handling. That means that +the driver must make sure that the work is cancelled +after it has made sure that no more URB can terminate +with an error condition. + +Hence the order of actions in ipheth_close() needs +to be inverted. + +Signed-off-by: Oliver Neukum +Signed-off-by: Foster Snowhill +Tested-by: Georgi Valkov +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/usb/ipheth.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c +index d56e276e4d80..4485388dcff2 100644 +--- a/drivers/net/usb/ipheth.c ++++ b/drivers/net/usb/ipheth.c +@@ -353,8 +353,8 @@ static int ipheth_close(struct net_device *net) + { + struct ipheth_device *dev = netdev_priv(net); + +- cancel_delayed_work_sync(&dev->carrier_work); + netif_stop_queue(net); ++ cancel_delayed_work_sync(&dev->carrier_work); + return 0; + } + +-- +2.43.0 + diff --git a/queue-5.10/usbnet-modern-method-to-get-random-mac.patch b/queue-5.10/usbnet-modern-method-to-get-random-mac.patch new file mode 100644 index 00000000000..6cd48e42f90 --- /dev/null +++ b/queue-5.10/usbnet-modern-method-to-get-random-mac.patch @@ -0,0 +1,75 @@ +From e9ef59cddb56f421406c22cd10b65a203744b6fa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 Aug 2024 19:50:55 +0200 +Subject: usbnet: modern method to get random MAC + +From: Oliver Neukum + +[ Upstream commit bab8eb0dd4cb995caa4a0529d5655531c2ec5e8e ] + +The driver generates a random MAC once on load +and uses it over and over, including on two devices +needing a random MAC at the same time. + +Jakub suggested revamping the driver to the modern +API for setting a random MAC rather than fixing +the old stuff. + +The bug is as old as the driver. + +Signed-off-by: Oliver Neukum +Reviewed-by: Simon Horman +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Link: https://patch.msgid.link/20240829175201.670718-1-oneukum@suse.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/usb/usbnet.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c +index e87d3108ef05..669cd20cfe00 100644 +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -64,9 +64,6 @@ + + /*-------------------------------------------------------------------------*/ + +-// randomly generated ethernet address +-static u8 node_id [ETH_ALEN]; +- + /* use ethtool to change the level for any given device */ + static int msg_level = -1; + module_param (msg_level, int, 0); +@@ -1696,7 +1693,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) + + dev->net = net; + strscpy(net->name, "usb%d", sizeof(net->name)); +- eth_hw_addr_set(net, node_id); + + /* rx and tx sides can use different message sizes; + * bind() should set rx_urb_size in that case. +@@ -1770,9 +1766,9 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) + goto out4; + } + +- /* let userspace know we have a random address */ +- if (ether_addr_equal(net->dev_addr, node_id)) +- net->addr_assign_type = NET_ADDR_RANDOM; ++ /* this flags the device for user space */ ++ if (!is_valid_ether_addr(net->dev_addr)) ++ eth_hw_addr_random(net); + + if ((dev->driver_info->flags & FLAG_WLAN) != 0) + SET_NETDEV_DEVTYPE(net, &wlan_type); +@@ -2182,7 +2178,6 @@ static int __init usbnet_init(void) + BUILD_BUG_ON( + sizeof_field(struct sk_buff, cb) < sizeof(struct skb_data)); + +- eth_random_addr(node_id); + return 0; + } + module_init(usbnet_init); +-- +2.43.0 + diff --git a/queue-5.10/wifi-brcmsmac-advertise-mfp_capable-to-enable-wpa3.patch b/queue-5.10/wifi-brcmsmac-advertise-mfp_capable-to-enable-wpa3.patch new file mode 100644 index 00000000000..5d57b680b76 --- /dev/null +++ b/queue-5.10/wifi-brcmsmac-advertise-mfp_capable-to-enable-wpa3.patch @@ -0,0 +1,38 @@ +From ff8f2aac1a1eb652dcd003664a1cd367fd284af3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 Jun 2024 14:26:09 +0200 +Subject: wifi: brcmsmac: advertise MFP_CAPABLE to enable WPA3 + +From: Arend van Spriel + +[ Upstream commit dbb5265a5d7cca1cdba7736dba313ab7d07bc19d ] + +After being asked about support for WPA3 for BCM43224 chipset it +was found that all it takes is setting the MFP_CAPABLE flag and +mac80211 will take care of all that is needed [1]. + +Link: https://lore.kernel.org/linux-wireless/20200526155909.5807-2-Larry.Finger@lwfinger.net/ [1] +Signed-off-by: Arend van Spriel +Tested-by: Reijer Boekhoff +Signed-off-by: Kalle Valo +Link: https://patch.msgid.link/20240617122609.349582-1-arend.vanspriel@broadcom.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +index fb76b4a69a05..ad3893d45058 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +@@ -1089,6 +1089,7 @@ static int ieee_hw_init(struct ieee80211_hw *hw) + ieee80211_hw_set(hw, AMPDU_AGGREGATION); + ieee80211_hw_set(hw, SIGNAL_DBM); + ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS); ++ ieee80211_hw_set(hw, MFP_CAPABLE); + + hw->extra_tx_headroom = brcms_c_get_header_len(); + hw->queues = N_TX_QUEUES; +-- +2.43.0 + diff --git a/queue-5.10/wifi-mwifiex-do-not-return-unused-priv-in-mwifiex_ge.patch b/queue-5.10/wifi-mwifiex-do-not-return-unused-priv-in-mwifiex_ge.patch new file mode 100644 index 00000000000..4a01cf758d5 --- /dev/null +++ b/queue-5.10/wifi-mwifiex-do-not-return-unused-priv-in-mwifiex_ge.patch @@ -0,0 +1,112 @@ +From 22e094836253eabb47fe9215779b16903846c733 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Jul 2024 09:24:09 +0200 +Subject: wifi: mwifiex: Do not return unused priv in mwifiex_get_priv_by_id() + +From: Sascha Hauer + +[ Upstream commit c145eea2f75ff7949392aebecf7ef0a81c1f6c14 ] + +mwifiex_get_priv_by_id() returns the priv pointer corresponding to +the bss_num and bss_type, but without checking if the priv is actually +currently in use. +Unused priv pointers do not have a wiphy attached to them which can +lead to NULL pointer dereferences further down the callstack. Fix +this by returning only used priv pointers which have priv->bss_mode +set to something else than NL80211_IFTYPE_UNSPECIFIED. + +Said NULL pointer dereference happened when an Accesspoint was started +with wpa_supplicant -i mlan0 with this config: + +network={ + ssid="somessid" + mode=2 + frequency=2412 + key_mgmt=WPA-PSK WPA-PSK-SHA256 + proto=RSN + group=CCMP + pairwise=CCMP + psk="12345678" +} + +When waiting for the AP to be established, interrupting wpa_supplicant +with and starting it again this happens: + +| Unable to handle kernel NULL pointer dereference at virtual address 0000000000000140 +| Mem abort info: +| ESR = 0x0000000096000004 +| EC = 0x25: DABT (current EL), IL = 32 bits +| SET = 0, FnV = 0 +| EA = 0, S1PTW = 0 +| FSC = 0x04: level 0 translation fault +| Data abort info: +| ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 +| CM = 0, WnR = 0, TnD = 0, TagAccess = 0 +| GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 +| user pgtable: 4k pages, 48-bit VAs, pgdp=0000000046d96000 +| [0000000000000140] pgd=0000000000000000, p4d=0000000000000000 +| Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP +| Modules linked in: caam_jr caamhash_desc spidev caamalg_desc crypto_engine authenc libdes mwifiex_sdio ++mwifiex crct10dif_ce cdc_acm onboard_usb_hub fsl_imx8_ddr_perf imx8m_ddrc rtc_ds1307 lm75 rtc_snvs ++imx_sdma caam imx8mm_thermal spi_imx error imx_cpufreq_dt fuse ip_tables x_tables ipv6 +| CPU: 0 PID: 8 Comm: kworker/0:1 Not tainted 6.9.0-00007-g937242013fce-dirty #18 +| Hardware name: somemachine (DT) +| Workqueue: events sdio_irq_work +| pstate: 00000005 (nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +| pc : mwifiex_get_cfp+0xd8/0x15c [mwifiex] +| lr : mwifiex_get_cfp+0x34/0x15c [mwifiex] +| sp : ffff8000818b3a70 +| x29: ffff8000818b3a70 x28: ffff000006bfd8a5 x27: 0000000000000004 +| x26: 000000000000002c x25: 0000000000001511 x24: 0000000002e86bc9 +| x23: ffff000006bfd996 x22: 0000000000000004 x21: ffff000007bec000 +| x20: 000000000000002c x19: 0000000000000000 x18: 0000000000000000 +| x17: 000000040044ffff x16: 00500072b5503510 x15: ccc283740681e517 +| x14: 0201000101006d15 x13: 0000000002e8ff43 x12: 002c01000000ffb1 +| x11: 0100000000000000 x10: 02e8ff43002c0100 x9 : 0000ffb100100157 +| x8 : ffff000003d20000 x7 : 00000000000002f1 x6 : 00000000ffffe124 +| x5 : 0000000000000001 x4 : 0000000000000003 x3 : 0000000000000000 +| x2 : 0000000000000000 x1 : 0001000000011001 x0 : 0000000000000000 +| Call trace: +| mwifiex_get_cfp+0xd8/0x15c [mwifiex] +| mwifiex_parse_single_response_buf+0x1d0/0x504 [mwifiex] +| mwifiex_handle_event_ext_scan_report+0x19c/0x2f8 [mwifiex] +| mwifiex_process_sta_event+0x298/0xf0c [mwifiex] +| mwifiex_process_event+0x110/0x238 [mwifiex] +| mwifiex_main_process+0x428/0xa44 [mwifiex] +| mwifiex_sdio_interrupt+0x64/0x12c [mwifiex_sdio] +| process_sdio_pending_irqs+0x64/0x1b8 +| sdio_irq_work+0x4c/0x7c +| process_one_work+0x148/0x2a0 +| worker_thread+0x2fc/0x40c +| kthread+0x110/0x114 +| ret_from_fork+0x10/0x20 +| Code: a94153f3 a8c37bfd d50323bf d65f03c0 (f940a000) +| ---[ end trace 0000000000000000 ]--- + +Signed-off-by: Sascha Hauer +Acked-by: Brian Norris +Reviewed-by: Francesco Dolcini +Signed-off-by: Kalle Valo +Link: https://patch.msgid.link/20240703072409.556618-1-s.hauer@pengutronix.de +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/marvell/mwifiex/main.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h +index f4e3dce10d65..5b14fe08811e 100644 +--- a/drivers/net/wireless/marvell/mwifiex/main.h ++++ b/drivers/net/wireless/marvell/mwifiex/main.h +@@ -1310,6 +1310,9 @@ mwifiex_get_priv_by_id(struct mwifiex_adapter *adapter, + + for (i = 0; i < adapter->priv_num; i++) { + if (adapter->priv[i]) { ++ if (adapter->priv[i]->bss_mode == NL80211_IFTYPE_UNSPECIFIED) ++ continue; ++ + if ((adapter->priv[i]->bss_num == bss_num) && + (adapter->priv[i]->bss_type == bss_type)) + break; +-- +2.43.0 + -- 2.47.3