]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Fixes for 4.9
authorSasha Levin <sashal@kernel.org>
Sun, 15 May 2022 18:30:38 +0000 (14:30 -0400)
committerSasha Levin <sashal@kernel.org>
Sun, 15 May 2022 18:30:38 +0000 (14:30 -0400)
Signed-off-by: Sasha Levin <sashal@kernel.org>
13 files changed:
queue-4.9/asoc-max98090-generate-notifications-on-changes-for-.patch [new file with mode: 0644]
queue-4.9/asoc-max98090-reject-invalid-values-in-custom-contro.patch [new file with mode: 0644]
queue-4.9/asoc-ops-validate-input-values-in-snd_soc_put_volsw_.patch [new file with mode: 0644]
queue-4.9/hwmon-f71882fg-fix-negative-temperature.patch [new file with mode: 0644]
queue-4.9/ipv4-drop-dst-in-multicast-routing-path.patch [new file with mode: 0644]
queue-4.9/mac80211_hwsim-call-ieee80211_tx_prepare_skb-under-r.patch [new file with mode: 0644]
queue-4.9/net-fix-features-skip-in-for_each_netdev_feature.patch [new file with mode: 0644]
queue-4.9/net-sfc-ef10-fix-memory-leak-in-efx_ef10_mtd_probe.patch [new file with mode: 0644]
queue-4.9/netlink-do-not-reset-transport-header-in-netlink_rec.patch [new file with mode: 0644]
queue-4.9/s390-ctcm-fix-potential-memory-leak.patch [new file with mode: 0644]
queue-4.9/s390-ctcm-fix-variable-dereferenced-before-check.patch [new file with mode: 0644]
queue-4.9/s390-lcs-fix-variable-dereferenced-before-check.patch [new file with mode: 0644]
queue-4.9/series [new file with mode: 0644]

diff --git a/queue-4.9/asoc-max98090-generate-notifications-on-changes-for-.patch b/queue-4.9/asoc-max98090-generate-notifications-on-changes-for-.patch
new file mode 100644 (file)
index 0000000..a826967
--- /dev/null
@@ -0,0 +1,37 @@
+From 1d61d9b2fdbaa478f367e44d8aa5071246eed183 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 20 Apr 2022 20:34:54 +0100
+Subject: ASoC: max98090: Generate notifications on changes for custom control
+
+From: Mark Brown <broonie@kernel.org>
+
+[ Upstream commit 13fcf676d9e102594effc686d98521ff5c90b925 ]
+
+The max98090 driver has some custom controls which share a put() function
+which returns 0 unconditionally, meaning that events are not generated
+when the value changes. Fix that.
+
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Link: https://lore.kernel.org/r/20220420193454.2647908-2-broonie@kernel.org
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ sound/soc/codecs/max98090.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
+index 4aefb13900c2..1a55f6aecdfe 100644
+--- a/sound/soc/codecs/max98090.c
++++ b/sound/soc/codecs/max98090.c
+@@ -436,7 +436,7 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
+               mask << mc->shift,
+               sel << mc->shift);
+-      return 0;
++      return *select != val;
+ }
+ static const char *max98090_perf_pwr_text[] =
+-- 
+2.35.1
+
diff --git a/queue-4.9/asoc-max98090-reject-invalid-values-in-custom-contro.patch b/queue-4.9/asoc-max98090-reject-invalid-values-in-custom-contro.patch
new file mode 100644 (file)
index 0000000..54cf307
--- /dev/null
@@ -0,0 +1,40 @@
+From 4910fc1745c26cca746d5be13094862d43f1b7a3 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 20 Apr 2022 20:34:53 +0100
+Subject: ASoC: max98090: Reject invalid values in custom control put()
+
+From: Mark Brown <broonie@kernel.org>
+
+[ Upstream commit 2fbe467bcbfc760a08f08475eea6bbd4c2874319 ]
+
+The max98090 driver has a custom put function for some controls which can
+only be updated in certain circumstances which makes no effort to validate
+that input is suitable for the control, allowing out of spec values to be
+written to the hardware and presented to userspace. Fix this by returning
+an error when invalid values are written.
+
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Link: https://lore.kernel.org/r/20220420193454.2647908-1-broonie@kernel.org
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ sound/soc/codecs/max98090.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
+index e7aef841f87d..4aefb13900c2 100644
+--- a/sound/soc/codecs/max98090.c
++++ b/sound/soc/codecs/max98090.c
+@@ -419,6 +419,9 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
+       val = (val >> mc->shift) & mask;
++      if (sel < 0 || sel > mc->max)
++              return -EINVAL;
++
+       *select = sel;
+       /* Setting a volume is only valid if it is already On */
+-- 
+2.35.1
+
diff --git a/queue-4.9/asoc-ops-validate-input-values-in-snd_soc_put_volsw_.patch b/queue-4.9/asoc-ops-validate-input-values-in-snd_soc_put_volsw_.patch
new file mode 100644 (file)
index 0000000..89d5b95
--- /dev/null
@@ -0,0 +1,60 @@
+From f07424adc080032773c51374acca75a1da2e2439 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 23 Apr 2022 14:12:39 +0100
+Subject: ASoC: ops: Validate input values in snd_soc_put_volsw_range()
+
+From: Mark Brown <broonie@kernel.org>
+
+[ Upstream commit aa22125c57f9e577f0a667e4fa07fc3fa8ca1e60 ]
+
+Check that values written via snd_soc_put_volsw_range() are
+within the range advertised by the control, ensuring that we
+don't write out of spec values to the hardware.
+
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Link: https://lore.kernel.org/r/20220423131239.3375261-1-broonie@kernel.org
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ sound/soc/soc-ops.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
+index 74968ddee49f..90ba5521c189 100644
+--- a/sound/soc/soc-ops.c
++++ b/sound/soc/soc-ops.c
+@@ -528,7 +528,15 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
+       unsigned int mask = (1 << fls(max)) - 1;
+       unsigned int invert = mc->invert;
+       unsigned int val, val_mask;
+-      int err, ret;
++      int err, ret, tmp;
++
++      tmp = ucontrol->value.integer.value[0];
++      if (tmp < 0)
++              return -EINVAL;
++      if (mc->platform_max && tmp > mc->platform_max)
++              return -EINVAL;
++      if (tmp > mc->max - mc->min + 1)
++              return -EINVAL;
+       if (invert)
+               val = (max - ucontrol->value.integer.value[0]) & mask;
+@@ -543,6 +551,14 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
+       ret = err;
+       if (snd_soc_volsw_is_stereo(mc)) {
++              tmp = ucontrol->value.integer.value[1];
++              if (tmp < 0)
++                      return -EINVAL;
++              if (mc->platform_max && tmp > mc->platform_max)
++                      return -EINVAL;
++              if (tmp > mc->max - mc->min + 1)
++                      return -EINVAL;
++
+               if (invert)
+                       val = (max - ucontrol->value.integer.value[1]) & mask;
+               else
+-- 
+2.35.1
+
diff --git a/queue-4.9/hwmon-f71882fg-fix-negative-temperature.patch b/queue-4.9/hwmon-f71882fg-fix-negative-temperature.patch
new file mode 100644 (file)
index 0000000..7529b7b
--- /dev/null
@@ -0,0 +1,46 @@
+From 86911354a087a3cfa559a0eb55fb01f065d65f9d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 18 Apr 2022 17:07:06 +0800
+Subject: hwmon: (f71882fg) Fix negative temperature
+
+From: Ji-Ze Hong (Peter Hong) <hpeter@gmail.com>
+
+[ Upstream commit 4aaaaf0f279836f06d3b9d0ffeec7a1e1a04ceef ]
+
+All temperature of Fintek superio hwmonitor that using 1-byte reg will use
+2's complement.
+
+In show_temp()
+       temp = data->temp[nr] * 1000;
+
+When data->temp[nr] read as 255, it indicate -1C, but this code will report
+255C to userspace. It'll be ok when change to:
+       temp = ((s8)data->temp[nr]) * 1000;
+
+Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com>
+Link: https://lore.kernel.org/r/20220418090706.6339-1-hpeter+linux_kernel@gmail.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/hwmon/f71882fg.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c
+index cb28e4b4fb10..b87ca56fb774 100644
+--- a/drivers/hwmon/f71882fg.c
++++ b/drivers/hwmon/f71882fg.c
+@@ -1590,8 +1590,9 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
+               temp *= 125;
+               if (sign)
+                       temp -= 128000;
+-      } else
+-              temp = data->temp[nr] * 1000;
++      } else {
++              temp = ((s8)data->temp[nr]) * 1000;
++      }
+       return sprintf(buf, "%d\n", temp);
+ }
+-- 
+2.35.1
+
diff --git a/queue-4.9/ipv4-drop-dst-in-multicast-routing-path.patch b/queue-4.9/ipv4-drop-dst-in-multicast-routing-path.patch
new file mode 100644 (file)
index 0000000..4e9c8c6
--- /dev/null
@@ -0,0 +1,67 @@
+From cb6cb4190a053e60712d339a594e6c1261f597d9 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 5 May 2022 14:00:17 +1200
+Subject: ipv4: drop dst in multicast routing path
+
+From: Lokesh Dhoundiyal <lokesh.dhoundiyal@alliedtelesis.co.nz>
+
+[ Upstream commit 9e6c6d17d1d6a3f1515ce399f9a011629ec79aa0 ]
+
+kmemleak reports the following when routing multicast traffic over an
+ipsec tunnel.
+
+Kmemleak output:
+unreferenced object 0x8000000044bebb00 (size 256):
+  comm "softirq", pid 0, jiffies 4294985356 (age 126.810s)
+  hex dump (first 32 bytes):
+    00 00 00 00 00 00 00 00 80 00 00 00 05 13 74 80  ..............t.
+    80 00 00 00 04 9b bf f9 00 00 00 00 00 00 00 00  ................
+  backtrace:
+    [<00000000f83947e0>] __kmalloc+0x1e8/0x300
+    [<00000000b7ed8dca>] metadata_dst_alloc+0x24/0x58
+    [<0000000081d32c20>] __ipgre_rcv+0x100/0x2b8
+    [<00000000824f6cf1>] gre_rcv+0x178/0x540
+    [<00000000ccd4e162>] gre_rcv+0x7c/0xd8
+    [<00000000c024b148>] ip_protocol_deliver_rcu+0x124/0x350
+    [<000000006a483377>] ip_local_deliver_finish+0x54/0x68
+    [<00000000d9271b3a>] ip_local_deliver+0x128/0x168
+    [<00000000bd4968ae>] xfrm_trans_reinject+0xb8/0xf8
+    [<0000000071672a19>] tasklet_action_common.isra.16+0xc4/0x1b0
+    [<0000000062e9c336>] __do_softirq+0x1fc/0x3e0
+    [<00000000013d7914>] irq_exit+0xc4/0xe0
+    [<00000000a4d73e90>] plat_irq_dispatch+0x7c/0x108
+    [<000000000751eb8e>] handle_int+0x16c/0x178
+    [<000000001668023b>] _raw_spin_unlock_irqrestore+0x1c/0x28
+
+The metadata dst is leaked when ip_route_input_mc() updates the dst for
+the skb. Commit f38a9eb1f77b ("dst: Metadata destinations") correctly
+handled dropping the dst in ip_route_input_slow() but missed the
+multicast case which is handled by ip_route_input_mc(). Drop the dst in
+ip_route_input_mc() avoiding the leak.
+
+Fixes: f38a9eb1f77b ("dst: Metadata destinations")
+Signed-off-by: Lokesh Dhoundiyal <lokesh.dhoundiyal@alliedtelesis.co.nz>
+Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Reviewed-by: David Ahern <dsahern@kernel.org>
+Link: https://lore.kernel.org/r/20220505020017.3111846-1-chris.packham@alliedtelesis.co.nz
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/ipv4/route.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/ipv4/route.c b/net/ipv4/route.c
+index f05b8d63dba3..624bdd74583b 100644
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -1606,6 +1606,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+ #endif
+       RT_CACHE_STAT_INC(in_slow_mc);
++      skb_dst_drop(skb);
+       skb_dst_set(skb, &rth->dst);
+       return 0;
+-- 
+2.35.1
+
diff --git a/queue-4.9/mac80211_hwsim-call-ieee80211_tx_prepare_skb-under-r.patch b/queue-4.9/mac80211_hwsim-call-ieee80211_tx_prepare_skb-under-r.patch
new file mode 100644 (file)
index 0000000..4dd5197
--- /dev/null
@@ -0,0 +1,52 @@
+From 2f06fc2d7435d5a2ec2da99097297c31a3af4d42 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 5 May 2022 23:04:22 +0200
+Subject: mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection
+
+From: Johannes Berg <johannes.berg@intel.com>
+
+[ Upstream commit 9e2db50f1ef2238fc2f71c5de1c0418b7a5b0ea2 ]
+
+This is needed since it might use (and pass out) pointers to
+e.g. keys protected by RCU. Can't really happen here as the
+frames aren't encrypted, but we need to still adhere to the
+rules.
+
+Fixes: cacfddf82baf ("mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work")
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Link: https://lore.kernel.org/r/20220505230421.5f139f9de173.I77ae111a28f7c0e9fd1ebcee7f39dbec5c606770@changeid
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/wireless/mac80211_hwsim.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
+index a34647efb5ea..2cd1b3cfcc09 100644
+--- a/drivers/net/wireless/mac80211_hwsim.c
++++ b/drivers/net/wireless/mac80211_hwsim.c
+@@ -1987,11 +1987,13 @@ static void hw_scan_work(struct work_struct *work)
+                               memcpy(skb_put(probe, req->ie_len), req->ie,
+                                      req->ie_len);
++                      rcu_read_lock();
+                       if (!ieee80211_tx_prepare_skb(hwsim->hw,
+                                                     hwsim->hw_scan_vif,
+                                                     probe,
+                                                     hwsim->tmp_chan->band,
+                                                     NULL)) {
++                              rcu_read_unlock();
+                               kfree_skb(probe);
+                               continue;
+                       }
+@@ -1999,6 +2001,7 @@ static void hw_scan_work(struct work_struct *work)
+                       local_bh_disable();
+                       mac80211_hwsim_tx_frame(hwsim->hw, probe,
+                                               hwsim->tmp_chan);
++                      rcu_read_unlock();
+                       local_bh_enable();
+               }
+       }
+-- 
+2.35.1
+
diff --git a/queue-4.9/net-fix-features-skip-in-for_each_netdev_feature.patch b/queue-4.9/net-fix-features-skip-in-for_each_netdev_feature.patch
new file mode 100644 (file)
index 0000000..89476d7
--- /dev/null
@@ -0,0 +1,49 @@
+From aad9a43d2681fbe68a3bce140dd5ba7bd1b664ed Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 4 May 2022 11:09:14 +0300
+Subject: net: Fix features skip in for_each_netdev_feature()
+
+From: Tariq Toukan <tariqt@nvidia.com>
+
+[ Upstream commit 85db6352fc8a158a893151baa1716463d34a20d0 ]
+
+The find_next_netdev_feature() macro gets the "remaining length",
+not bit index.
+Passing "bit - 1" for the following iteration is wrong as it skips
+the adjacent bit. Pass "bit" instead.
+
+Fixes: 3b89ea9c5902 ("net: Fix for_each_netdev_feature on Big endian")
+Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
+Reviewed-by: Gal Pressman <gal@nvidia.com>
+Link: https://lore.kernel.org/r/20220504080914.1918-1-tariqt@nvidia.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ include/linux/netdev_features.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
+index b692edeb0b90..27abbd7fbb2b 100644
+--- a/include/linux/netdev_features.h
++++ b/include/linux/netdev_features.h
+@@ -139,7 +139,7 @@ enum {
+ #define NETIF_F_BUSY_POLL     __NETIF_F(BUSY_POLL)
+ #define NETIF_F_HW_TC         __NETIF_F(HW_TC)
+-/* Finds the next feature with the highest number of the range of start till 0.
++/* Finds the next feature with the highest number of the range of start-1 till 0.
+  */
+ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
+ {
+@@ -158,7 +158,7 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
+       for ((bit) = find_next_netdev_feature((mask_addr),              \
+                                             NETDEV_FEATURE_COUNT);    \
+            (bit) >= 0;                                                \
+-           (bit) = find_next_netdev_feature((mask_addr), (bit) - 1))
++           (bit) = find_next_netdev_feature((mask_addr), (bit)))
+ /* Features valid for ethtool to change */
+ /* = all defined minus driver/device-class-related */
+-- 
+2.35.1
+
diff --git a/queue-4.9/net-sfc-ef10-fix-memory-leak-in-efx_ef10_mtd_probe.patch b/queue-4.9/net-sfc-ef10-fix-memory-leak-in-efx_ef10_mtd_probe.patch
new file mode 100644 (file)
index 0000000..beccfc0
--- /dev/null
@@ -0,0 +1,72 @@
+From 509ec202108ce1571f0b337d4ab1d3bc15660ffa Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 12 May 2022 05:47:09 +0000
+Subject: net: sfc: ef10: fix memory leak in efx_ef10_mtd_probe()
+
+From: Taehee Yoo <ap420073@gmail.com>
+
+[ Upstream commit 1fa89ffbc04545b7582518e57f4b63e2a062870f ]
+
+In the NIC ->probe() callback, ->mtd_probe() callback is called.
+If NIC has 2 ports, ->probe() is called twice and ->mtd_probe() too.
+In the ->mtd_probe(), which is efx_ef10_mtd_probe() it allocates and
+initializes mtd partiion.
+But mtd partition for sfc is shared data.
+So that allocated mtd partition data from last called
+efx_ef10_mtd_probe() will not be used.
+Therefore it must be freed.
+But it doesn't free a not used mtd partition data in efx_ef10_mtd_probe().
+
+kmemleak reports:
+unreferenced object 0xffff88811ddb0000 (size 63168):
+  comm "systemd-udevd", pid 265, jiffies 4294681048 (age 348.586s)
+  hex dump (first 32 bytes):
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  backtrace:
+    [<ffffffffa3767749>] kmalloc_order_trace+0x19/0x120
+    [<ffffffffa3873f0e>] __kmalloc+0x20e/0x250
+    [<ffffffffc041389f>] efx_ef10_mtd_probe+0x11f/0x270 [sfc]
+    [<ffffffffc0484c8a>] efx_pci_probe.cold.17+0x3df/0x53d [sfc]
+    [<ffffffffa414192c>] local_pci_probe+0xdc/0x170
+    [<ffffffffa4145df5>] pci_device_probe+0x235/0x680
+    [<ffffffffa443dd52>] really_probe+0x1c2/0x8f0
+    [<ffffffffa443e72b>] __driver_probe_device+0x2ab/0x460
+    [<ffffffffa443e92a>] driver_probe_device+0x4a/0x120
+    [<ffffffffa443f2ae>] __driver_attach+0x16e/0x320
+    [<ffffffffa4437a90>] bus_for_each_dev+0x110/0x190
+    [<ffffffffa443b75e>] bus_add_driver+0x39e/0x560
+    [<ffffffffa4440b1e>] driver_register+0x18e/0x310
+    [<ffffffffc02e2055>] 0xffffffffc02e2055
+    [<ffffffffa3001af3>] do_one_initcall+0xc3/0x450
+    [<ffffffffa33ca574>] do_init_module+0x1b4/0x700
+
+Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
+Fixes: 8127d661e77f ("sfc: Add support for Solarflare SFC9100 family")
+Signed-off-by: Taehee Yoo <ap420073@gmail.com>
+Link: https://lore.kernel.org/r/20220512054709.12513-1-ap420073@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/ethernet/sfc/ef10.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
+index 22bc3dc44298..aa2cef8675f4 100644
+--- a/drivers/net/ethernet/sfc/ef10.c
++++ b/drivers/net/ethernet/sfc/ef10.c
+@@ -5197,6 +5197,11 @@ static int efx_ef10_mtd_probe(struct efx_nic *efx)
+               n_parts++;
+       }
++      if (!n_parts) {
++              kfree(parts);
++              return 0;
++      }
++
+       rc = efx_mtd_add(efx, &parts[0].common, n_parts, sizeof(*parts));
+ fail:
+       if (rc)
+-- 
+2.35.1
+
diff --git a/queue-4.9/netlink-do-not-reset-transport-header-in-netlink_rec.patch b/queue-4.9/netlink-do-not-reset-transport-header-in-netlink_rec.patch
new file mode 100644 (file)
index 0000000..9f5b30a
--- /dev/null
@@ -0,0 +1,76 @@
+From 92b14381f5424aa3e04e9b14ca7642e0e1c27b21 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 5 May 2022 09:19:46 -0700
+Subject: netlink: do not reset transport header in netlink_recvmsg()
+
+From: Eric Dumazet <edumazet@google.com>
+
+[ Upstream commit d5076fe4049cadef1f040eda4aaa001bb5424225 ]
+
+netlink_recvmsg() does not need to change transport header.
+
+If transport header was needed, it should have been reset
+by the producer (netlink_dump()), not the consumer(s).
+
+The following trace probably happened when multiple threads
+were using MSG_PEEK.
+
+BUG: KCSAN: data-race in netlink_recvmsg / netlink_recvmsg
+
+write to 0xffff88811e9f15b2 of 2 bytes by task 32012 on cpu 1:
+ skb_reset_transport_header include/linux/skbuff.h:2760 [inline]
+ netlink_recvmsg+0x1de/0x790 net/netlink/af_netlink.c:1978
+ sock_recvmsg_nosec net/socket.c:948 [inline]
+ sock_recvmsg net/socket.c:966 [inline]
+ __sys_recvfrom+0x204/0x2c0 net/socket.c:2097
+ __do_sys_recvfrom net/socket.c:2115 [inline]
+ __se_sys_recvfrom net/socket.c:2111 [inline]
+ __x64_sys_recvfrom+0x74/0x90 net/socket.c:2111
+ do_syscall_x64 arch/x86/entry/common.c:50 [inline]
+ do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80
+ entry_SYSCALL_64_after_hwframe+0x44/0xae
+
+write to 0xffff88811e9f15b2 of 2 bytes by task 32005 on cpu 0:
+ skb_reset_transport_header include/linux/skbuff.h:2760 [inline]
+ netlink_recvmsg+0x1de/0x790 net/netlink/af_netlink.c:1978
+ ____sys_recvmsg+0x162/0x2f0
+ ___sys_recvmsg net/socket.c:2674 [inline]
+ __sys_recvmsg+0x209/0x3f0 net/socket.c:2704
+ __do_sys_recvmsg net/socket.c:2714 [inline]
+ __se_sys_recvmsg net/socket.c:2711 [inline]
+ __x64_sys_recvmsg+0x42/0x50 net/socket.c:2711
+ do_syscall_x64 arch/x86/entry/common.c:50 [inline]
+ do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80
+ entry_SYSCALL_64_after_hwframe+0x44/0xae
+
+value changed: 0xffff -> 0x0000
+
+Reported by Kernel Concurrency Sanitizer on:
+CPU: 0 PID: 32005 Comm: syz-executor.4 Not tainted 5.18.0-rc1-syzkaller-00328-ge1f700ebd6be-dirty #0
+Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
+
+Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reported-by: syzbot <syzkaller@googlegroups.com>
+Link: https://lore.kernel.org/r/20220505161946.2867638-1-eric.dumazet@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/netlink/af_netlink.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
+index a8674e9ff37b..47b1631bf14c 100644
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -1929,7 +1929,6 @@ static int netlink_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+               copied = len;
+       }
+-      skb_reset_transport_header(data_skb);
+       err = skb_copy_datagram_msg(data_skb, 0, msg, copied);
+       if (msg->msg_name) {
+-- 
+2.35.1
+
diff --git a/queue-4.9/s390-ctcm-fix-potential-memory-leak.patch b/queue-4.9/s390-ctcm-fix-potential-memory-leak.patch
new file mode 100644 (file)
index 0000000..7f92a8c
--- /dev/null
@@ -0,0 +1,67 @@
+From c087260fd1786cece71289d27b0e402524790b63 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 10 May 2022 09:05:07 +0200
+Subject: s390/ctcm: fix potential memory leak
+
+From: Alexandra Winter <wintera@linux.ibm.com>
+
+[ Upstream commit 0c0b20587b9f25a2ad14db7f80ebe49bdf29920a ]
+
+smatch complains about
+drivers/s390/net/ctcm_mpc.c:1210 ctcmpc_unpack_skb() warn: possible memory leak of 'mpcginfo'
+
+mpc_action_discontact() did not free mpcginfo. Consolidate the freeing in
+ctcmpc_unpack_skb().
+
+Fixes: 293d984f0e36 ("ctcm: infrastructure for replaced ctc driver")
+Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/s390/net/ctcm_mpc.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
+index c103fc7efe9f..f2559e20df70 100644
+--- a/drivers/s390/net/ctcm_mpc.c
++++ b/drivers/s390/net/ctcm_mpc.c
+@@ -624,8 +624,6 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
+               ctcm_clear_busy_do(dev);
+       }
+-      kfree(mpcginfo);
+-
+       return;
+ }
+@@ -1205,10 +1203,10 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
+                                               CTCM_FUNTAIL, dev->name);
+                       priv->stats.rx_dropped++;
+                       /* mpcginfo only used for non-data transfers */
+-                      kfree(mpcginfo);
+                       if (do_debug_data)
+                               ctcmpc_dump_skb(pskb, -8);
+               }
++              kfree(mpcginfo);
+       }
+ done:
+@@ -1998,7 +1996,6 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg)
+               }
+               break;
+       }
+-      kfree(mpcginfo);
+       CTCM_PR_DEBUG("ctcmpc:%s() %s xid2:%i xid7:%i xidt_p2:%i \n",
+               __func__, ch->id, grp->outstanding_xid2,
+@@ -2059,7 +2056,6 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg)
+               mpc_validate_xid(mpcginfo);
+               break;
+       }
+-      kfree(mpcginfo);
+       return;
+ }
+-- 
+2.35.1
+
diff --git a/queue-4.9/s390-ctcm-fix-variable-dereferenced-before-check.patch b/queue-4.9/s390-ctcm-fix-variable-dereferenced-before-check.patch
new file mode 100644 (file)
index 0000000..54bf9a5
--- /dev/null
@@ -0,0 +1,44 @@
+From 794c3a5b2713f78f8c005f86ce161ccc412fe273 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 10 May 2022 09:05:06 +0200
+Subject: s390/ctcm: fix variable dereferenced before check
+
+From: Alexandra Winter <wintera@linux.ibm.com>
+
+[ Upstream commit 2c50c6867c85afee6f2b3bcbc50fc9d0083d1343 ]
+
+Found by cppcheck and smatch.
+smatch complains about
+drivers/s390/net/ctcm_sysfs.c:43 ctcm_buffer_write() warn: variable dereferenced before check 'priv' (see line 42)
+
+Fixes: 3c09e2647b5e ("ctcm: rename READ/WRITE defines to avoid redefinitions")
+Reported-by: Colin Ian King <colin.i.king@gmail.com>
+Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/s390/net/ctcm_sysfs.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c
+index ddb0aa321339..07b7177abf26 100644
+--- a/drivers/s390/net/ctcm_sysfs.c
++++ b/drivers/s390/net/ctcm_sysfs.c
+@@ -38,11 +38,12 @@ static ssize_t ctcm_buffer_write(struct device *dev,
+       struct ctcm_priv *priv = dev_get_drvdata(dev);
+       int rc;
+-      ndev = priv->channel[CTCM_READ]->netdev;
+-      if (!(priv && priv->channel[CTCM_READ] && ndev)) {
++      if (!(priv && priv->channel[CTCM_READ] &&
++            priv->channel[CTCM_READ]->netdev)) {
+               CTCM_DBF_TEXT(SETUP, CTC_DBF_ERROR, "bfnondev");
+               return -ENODEV;
+       }
++      ndev = priv->channel[CTCM_READ]->netdev;
+       rc = kstrtouint(buf, 0, &bs1);
+       if (rc)
+-- 
+2.35.1
+
diff --git a/queue-4.9/s390-lcs-fix-variable-dereferenced-before-check.patch b/queue-4.9/s390-lcs-fix-variable-dereferenced-before-check.patch
new file mode 100644 (file)
index 0000000..b128ea8
--- /dev/null
@@ -0,0 +1,42 @@
+From 74eb6283225e84881e62678e78c5e69753ffc05d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 10 May 2022 09:05:08 +0200
+Subject: s390/lcs: fix variable dereferenced before check
+
+From: Alexandra Winter <wintera@linux.ibm.com>
+
+[ Upstream commit 671bb35c8e746439f0ed70815968f9a4f20a8deb ]
+
+smatch complains about
+drivers/s390/net/lcs.c:1741 lcs_get_control() warn: variable dereferenced before check 'card->dev' (see line 1739)
+
+Fixes: 27eb5ac8f015 ("[PATCH] s390: lcs driver bug fixes and improvements [1/2]")
+Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/s390/net/lcs.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
+index 251db0a02e73..4d3caad7e981 100644
+--- a/drivers/s390/net/lcs.c
++++ b/drivers/s390/net/lcs.c
+@@ -1761,10 +1761,11 @@ lcs_get_control(struct lcs_card *card, struct lcs_cmd *cmd)
+                       lcs_schedule_recovery(card);
+                       break;
+               case LCS_CMD_STOPLAN:
+-                      pr_warn("Stoplan for %s initiated by LGW\n",
+-                              card->dev->name);
+-                      if (card->dev)
++                      if (card->dev) {
++                              pr_warn("Stoplan for %s initiated by LGW\n",
++                                      card->dev->name);
+                               netif_carrier_off(card->dev);
++                      }
+                       break;
+               default:
+                       LCS_DBF_TEXT(5, trace, "noLGWcmd");
+-- 
+2.35.1
+
diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644 (file)
index 0000000..6b3fbef
--- /dev/null
@@ -0,0 +1,12 @@
+net-fix-features-skip-in-for_each_netdev_feature.patch
+ipv4-drop-dst-in-multicast-routing-path.patch
+netlink-do-not-reset-transport-header-in-netlink_rec.patch
+mac80211_hwsim-call-ieee80211_tx_prepare_skb-under-r.patch
+s390-ctcm-fix-variable-dereferenced-before-check.patch
+s390-ctcm-fix-potential-memory-leak.patch
+s390-lcs-fix-variable-dereferenced-before-check.patch
+net-sfc-ef10-fix-memory-leak-in-efx_ef10_mtd_probe.patch
+hwmon-f71882fg-fix-negative-temperature.patch
+asoc-max98090-reject-invalid-values-in-custom-contro.patch
+asoc-max98090-generate-notifications-on-changes-for-.patch
+asoc-ops-validate-input-values-in-snd_soc_put_volsw_.patch