From: Sasha Levin Date: Wed, 22 Jul 2020 17:30:24 +0000 (-0400) Subject: Fixes for 4.9 X-Git-Tag: v4.14.190~60 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89d6f92fa3b3c23b922ac51072454962943451ec;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch b/queue-4.9/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch new file mode 100644 index 00000000000..fec2f017002 --- /dev/null +++ b/queue-4.9/drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch @@ -0,0 +1,58 @@ +From 0e8b0beae468423cf1a30dfa788303b7762930f2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 5 Jul 2020 17:45:21 -0700 +Subject: drivers/net/wan/lapbether: Fixed the value of hard_header_len + +From: Xie He + +[ Upstream commit 9dc829a135fb5927f1519de11286e2bbb79f5b66 ] + +When this driver transmits data, + first this driver will remove a pseudo header of 1 byte, + then the lapb module will prepend the LAPB header of 2 or 3 bytes, + then this driver will prepend a length field of 2 bytes, + then the underlying Ethernet device will prepend its own header. + +So, the header length required should be: + -1 + 3 + 2 + "the header length needed by the underlying device". + +This patch fixes kernel panic when this driver is used with AF_PACKET +SOCK_DGRAM sockets. + +Signed-off-by: Xie He +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/wan/lapbether.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c +index 6676607164d65..f5657783fad4e 100644 +--- a/drivers/net/wan/lapbether.c ++++ b/drivers/net/wan/lapbether.c +@@ -308,7 +308,6 @@ static void lapbeth_setup(struct net_device *dev) + dev->netdev_ops = &lapbeth_netdev_ops; + dev->destructor = free_netdev; + dev->type = ARPHRD_X25; +- dev->hard_header_len = 3; + dev->mtu = 1000; + dev->addr_len = 0; + } +@@ -329,6 +328,14 @@ static int lapbeth_new_device(struct net_device *dev) + if (!ndev) + goto out; + ++ /* When transmitting data: ++ * first this driver removes a pseudo header of 1 byte, ++ * then the lapb module prepends an LAPB header of at most 3 bytes, ++ * then this driver prepends a length field of 2 bytes, ++ * then the underlying Ethernet device prepends its own header. ++ */ ++ ndev->hard_header_len = -1 + 3 + 2 + dev->hard_header_len; ++ + lapbeth = netdev_priv(ndev); + lapbeth->axdev = ndev; + +-- +2.25.1 + diff --git a/queue-4.9/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch b/queue-4.9/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch new file mode 100644 index 00000000000..5f63ac2c9b2 --- /dev/null +++ b/queue-4.9/drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch @@ -0,0 +1,56 @@ +From 88ca5e14ac300c257ce4fbbc92ca0cade501ffd3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Jun 2020 16:39:13 +1000 +Subject: drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout + +From: Ben Skeggs + +[ Upstream commit 0156e76d388310a490aeb0f2fbb5b284ded3aecc ] + +Tegra TRM says worst-case reply time is 1216us, and this should fix some +spurious timeouts that have been popping up. + +Signed-off-by: Ben Skeggs +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 ++-- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c +index 954f5b76bfcf7..d44965f805fe9 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c +@@ -118,10 +118,10 @@ g94_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, + if (retries) + udelay(400); + +- /* transaction request, wait up to 1ms for it to complete */ ++ /* transaction request, wait up to 2ms for it to complete */ + nvkm_wr32(device, 0x00e4e4 + base, 0x00010000 | ctrl); + +- timeout = 1000; ++ timeout = 2000; + do { + ctrl = nvkm_rd32(device, 0x00e4e4 + base); + udelay(1); +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c +index 61d729b82c69b..a5783f4d972e3 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c +@@ -118,10 +118,10 @@ gm200_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, + if (retries) + udelay(400); + +- /* transaction request, wait up to 1ms for it to complete */ ++ /* transaction request, wait up to 2ms for it to complete */ + nvkm_wr32(device, 0x00d954 + base, 0x00010000 | ctrl); + +- timeout = 1000; ++ timeout = 2000; + do { + ctrl = nvkm_rd32(device, 0x00d954 + base); + udelay(1); +-- +2.25.1 + diff --git a/queue-4.9/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch b/queue-4.9/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch new file mode 100644 index 00000000000..fa45f1d3c14 --- /dev/null +++ b/queue-4.9/mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch @@ -0,0 +1,80 @@ +From c703e657a577ccf5b8866156c826d9dd52b52f34 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Jun 2020 12:42:14 +0200 +Subject: mac80211: allow rx of mesh eapol frames with default rx key + +From: Markus Theil + +[ Upstream commit 0b467b63870d9c05c81456aa9bfee894ab2db3b6 ] + +Without this patch, eapol frames cannot be received in mesh +mode, when 802.1X should be used. Initially only a MGTK is +defined, which is found and set as rx->key, when there are +no other keys set. ieee80211_drop_unencrypted would then +drop these eapol frames, as they are data frames without +encryption and there exists some rx->key. + +Fix this by differentiating between mesh eapol frames and +other data frames with existing rx->key. Allow mesh mesh +eapol frames only if they are for our vif address. + +With this patch in-place, ieee80211_rx_h_mesh_fwding continues +after the ieee80211_drop_unencrypted check and notices, that +these eapol frames have to be delivered locally, as they should. + +Signed-off-by: Markus Theil +Link: https://lore.kernel.org/r/20200625104214.50319-1-markus.theil@tu-ilmenau.de +[small code cleanups] +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/rx.c | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c +index d3334fd84ca20..9be82ed02e0e5 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -2098,6 +2098,7 @@ static int ieee80211_802_1x_port_control(struct ieee80211_rx_data *rx) + + static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) + { ++ struct ieee80211_hdr *hdr = (void *)rx->skb->data; + struct sk_buff *skb = rx->skb; + struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); + +@@ -2108,6 +2109,31 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) + if (status->flag & RX_FLAG_DECRYPTED) + return 0; + ++ /* check mesh EAPOL frames first */ ++ if (unlikely(rx->sta && ieee80211_vif_is_mesh(&rx->sdata->vif) && ++ ieee80211_is_data(fc))) { ++ struct ieee80211s_hdr *mesh_hdr; ++ u16 hdr_len = ieee80211_hdrlen(fc); ++ u16 ethertype_offset; ++ __be16 ethertype; ++ ++ if (!ether_addr_equal(hdr->addr1, rx->sdata->vif.addr)) ++ goto drop_check; ++ ++ /* make sure fixed part of mesh header is there, also checks skb len */ ++ if (!pskb_may_pull(rx->skb, hdr_len + 6)) ++ goto drop_check; ++ ++ mesh_hdr = (struct ieee80211s_hdr *)(skb->data + hdr_len); ++ ethertype_offset = hdr_len + ieee80211_get_mesh_hdrlen(mesh_hdr) + ++ sizeof(rfc1042_header); ++ ++ if (skb_copy_bits(rx->skb, ethertype_offset, ðertype, 2) == 0 && ++ ethertype == rx->sdata->control_port_protocol) ++ return 0; ++ } ++ ++drop_check: + /* Drop unencrypted frames if key is set. */ + if (unlikely(!ieee80211_has_protected(fc) && + !ieee80211_is_any_nullfunc(fc) && +-- +2.25.1 + diff --git a/queue-4.9/net-sky2-initialize-return-of-gm_phy_read.patch b/queue-4.9/net-sky2-initialize-return-of-gm_phy_read.patch new file mode 100644 index 00000000000..217c625fbfe --- /dev/null +++ b/queue-4.9/net-sky2-initialize-return-of-gm_phy_read.patch @@ -0,0 +1,50 @@ +From 3bab75e190bceb836055425f94445e804ab25360 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Jul 2020 06:33:59 -0700 +Subject: net: sky2: initialize return of gm_phy_read + +From: Tom Rix + +[ Upstream commit 28b18e4eb515af7c6661c3995c6e3c34412c2874 ] + +clang static analysis flags this garbage return + +drivers/net/ethernet/marvell/sky2.c:208:2: warning: Undefined or garbage value returned to caller [core.uninitialized.UndefReturn] + return v; + ^~~~~~~~ + +static inline u16 gm_phy_read( ... +{ + u16 v; + __gm_phy_read(hw, port, reg, &v); + return v; +} + +__gm_phy_read can return without setting v. + +So handle similar to skge.c's gm_phy_read, initialize v. + +Signed-off-by: Tom Rix +Reviewed-by: Andrew Lunn +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/marvell/sky2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c +index 49f692907a30b..c4197d0ec4d25 100644 +--- a/drivers/net/ethernet/marvell/sky2.c ++++ b/drivers/net/ethernet/marvell/sky2.c +@@ -215,7 +215,7 @@ io_error: + + static inline u16 gm_phy_read(struct sky2_hw *hw, unsigned port, u16 reg) + { +- u16 v; ++ u16 v = 0; + __gm_phy_read(hw, port, reg, &v); + return v; + } +-- +2.25.1 + diff --git a/queue-4.9/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch b/queue-4.9/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch new file mode 100644 index 00000000000..edfdd725494 --- /dev/null +++ b/queue-4.9/pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch @@ -0,0 +1,45 @@ +From 516591b615ae81e56c10be9f508fde83cf420275 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Jun 2020 09:50:24 +0800 +Subject: pinctrl: amd: fix npins for uart0 in kerncz_groups + +From: Jacky Hu + +[ Upstream commit 69339d083dfb7786b0e0b3fc19eaddcf11fabdfb ] + +uart0_pins is defined as: +static const unsigned uart0_pins[] = {135, 136, 137, 138, 139}; + +which npins is wronly specified as 9 later + { + .name = "uart0", + .pins = uart0_pins, + .npins = 9, + }, + +npins should be 5 instead of 9 according to the definition. + +Signed-off-by: Jacky Hu +Link: https://lore.kernel.org/r/20200616015024.287683-1-hengqing.hu@gmail.com +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-amd.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/pinctrl/pinctrl-amd.h b/drivers/pinctrl/pinctrl-amd.h +index e8bbb20779d0d..83597e1d6dcd7 100644 +--- a/drivers/pinctrl/pinctrl-amd.h ++++ b/drivers/pinctrl/pinctrl-amd.h +@@ -250,7 +250,7 @@ static const struct amd_pingroup kerncz_groups[] = { + { + .name = "uart0", + .pins = uart0_pins, +- .npins = 9, ++ .npins = 5, + }, + { + .name = "uart1", +-- +2.25.1 + diff --git a/queue-4.9/scsi-scsi_transport_spi-fix-function-pointer-check.patch b/queue-4.9/scsi-scsi_transport_spi-fix-function-pointer-check.patch new file mode 100644 index 00000000000..9619e00a4ca --- /dev/null +++ b/queue-4.9/scsi-scsi_transport_spi-fix-function-pointer-check.patch @@ -0,0 +1,50 @@ +From 869d4f92b333c9480bc2a741533cbe16a3d7d52a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 27 Jun 2020 06:32:42 -0700 +Subject: scsi: scsi_transport_spi: Fix function pointer check + +From: Tom Rix + +[ Upstream commit 5aee52c44d9170591df65fafa1cd408acc1225ce ] + +clang static analysis flags several null function pointer problems. + +drivers/scsi/scsi_transport_spi.c:374:1: warning: Called function pointer is null (null dereference) [core.CallAndMessage] +spi_transport_max_attr(offset, "%d\n"); +^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Reviewing the store_spi_store_max macro + + if (i->f->set_##field) + return -EINVAL; + +should be + + if (!i->f->set_##field) + return -EINVAL; + +Link: https://lore.kernel.org/r/20200627133242.21618-1-trix@redhat.com +Reviewed-by: James Bottomley +Signed-off-by: Tom Rix +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_transport_spi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c +index 319868f3f6743..083cd11ce7d7d 100644 +--- a/drivers/scsi/scsi_transport_spi.c ++++ b/drivers/scsi/scsi_transport_spi.c +@@ -353,7 +353,7 @@ store_spi_transport_##field(struct device *dev, \ + struct spi_transport_attrs *tp \ + = (struct spi_transport_attrs *)&starget->starget_data; \ + \ +- if (i->f->set_##field) \ ++ if (!i->f->set_##field) \ + return -EINVAL; \ + val = simple_strtoul(buf, NULL, 0); \ + if (val > tp->max_##field) \ +-- +2.25.1 + diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..0704bea9544 --- /dev/null +++ b/queue-4.9/series @@ -0,0 +1,8 @@ +pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch +mac80211-allow-rx-of-mesh-eapol-frames-with-default-.patch +scsi-scsi_transport_spi-fix-function-pointer-check.patch +xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch +xtensa-update-pos-in-cpuinfo_op.next.patch +drivers-net-wan-lapbether-fixed-the-value-of-hard_he.patch +net-sky2-initialize-return-of-gm_phy_read.patch +drm-nouveau-i2c-g94-increase-nv_pmgr_dp_auxctl_trans.patch diff --git a/queue-4.9/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch b/queue-4.9/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch new file mode 100644 index 00000000000..90748715f5a --- /dev/null +++ b/queue-4.9/xtensa-fix-__sync_fetch_and_-and-or-_4-declarations.patch @@ -0,0 +1,53 @@ +From 65b9a660ca056ff99a32538cbccb420e44422576 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Jun 2020 13:37:10 -0700 +Subject: xtensa: fix __sync_fetch_and_{and,or}_4 declarations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Max Filippov + +[ Upstream commit 73f9941306d5ce030f3ffc7db425c7b2a798cf8e ] + +Building xtensa kernel with gcc-10 produces the following warnings: + arch/xtensa/kernel/xtensa_ksyms.c:90:15: warning: conflicting types + for built-in function ‘__sync_fetch_and_and_4’; + expected ‘unsigned int(volatile void *, unsigned int)’ + [-Wbuiltin-declaration-mismatch] + arch/xtensa/kernel/xtensa_ksyms.c:96:15: warning: conflicting types + for built-in function ‘__sync_fetch_and_or_4’; + expected ‘unsigned int(volatile void *, unsigned int)’ + [-Wbuiltin-declaration-mismatch] + +Fix declarations of these functions to avoid the warning. + +Signed-off-by: Max Filippov +Signed-off-by: Sasha Levin +--- + arch/xtensa/kernel/xtensa_ksyms.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c +index 9210b9cc4ec96..455c6ec4086c2 100644 +--- a/arch/xtensa/kernel/xtensa_ksyms.c ++++ b/arch/xtensa/kernel/xtensa_ksyms.c +@@ -82,13 +82,13 @@ void __xtensa_libgcc_window_spill(void) + } + EXPORT_SYMBOL(__xtensa_libgcc_window_spill); + +-unsigned long __sync_fetch_and_and_4(unsigned long *p, unsigned long v) ++unsigned int __sync_fetch_and_and_4(volatile void *p, unsigned int v) + { + BUG(); + } + EXPORT_SYMBOL(__sync_fetch_and_and_4); + +-unsigned long __sync_fetch_and_or_4(unsigned long *p, unsigned long v) ++unsigned int __sync_fetch_and_or_4(volatile void *p, unsigned int v) + { + BUG(); + } +-- +2.25.1 + diff --git a/queue-4.9/xtensa-update-pos-in-cpuinfo_op.next.patch b/queue-4.9/xtensa-update-pos-in-cpuinfo_op.next.patch new file mode 100644 index 00000000000..d5ca73d944e --- /dev/null +++ b/queue-4.9/xtensa-update-pos-in-cpuinfo_op.next.patch @@ -0,0 +1,37 @@ +From 8bc6cae1f20a60e13d7a47b48a443923c08fa473 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Jul 2020 08:32:25 -0700 +Subject: xtensa: update *pos in cpuinfo_op.next + +From: Max Filippov + +[ Upstream commit 0d5ab144429e8bd80889b856a44d56ab4a5cd59b ] + +Increment *pos in the cpuinfo_op.next to fix the following warning +triggered by cat /proc/cpuinfo: + + seq_file: buggy .next function c_next did not update position index + +Signed-off-by: Max Filippov +Signed-off-by: Sasha Levin +--- + arch/xtensa/kernel/setup.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c +index b9beae798d727..8679fa3062060 100644 +--- a/arch/xtensa/kernel/setup.c ++++ b/arch/xtensa/kernel/setup.c +@@ -830,7 +830,8 @@ c_start(struct seq_file *f, loff_t *pos) + static void * + c_next(struct seq_file *f, void *v, loff_t *pos) + { +- return NULL; ++ ++*pos; ++ return c_start(f, pos); + } + + static void +-- +2.25.1 +