From: Sasha Levin Date: Sun, 15 May 2022 18:30:35 +0000 (-0400) Subject: Fixes for 5.4 X-Git-Tag: v4.9.315~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad7fba0fa91f28a798a56bbc665aef70d97f3764;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/asoc-max98090-generate-notifications-on-changes-for-.patch b/queue-5.4/asoc-max98090-generate-notifications-on-changes-for-.patch new file mode 100644 index 00000000000..2ffa8d590e5 --- /dev/null +++ b/queue-5.4/asoc-max98090-generate-notifications-on-changes-for-.patch @@ -0,0 +1,37 @@ +From ca92c7b0c45f41eee4f95135f87bb830a33d1e34 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Apr 2022 20:34:54 +0100 +Subject: ASoC: max98090: Generate notifications on changes for custom control + +From: Mark Brown + +[ 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 +Link: https://lore.kernel.org/r/20220420193454.2647908-2-broonie@kernel.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + 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 207cdcfb6ebb..ce9f99dd3e87 100644 +--- a/sound/soc/codecs/max98090.c ++++ b/sound/soc/codecs/max98090.c +@@ -430,7 +430,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-5.4/asoc-max98090-reject-invalid-values-in-custom-contro.patch b/queue-5.4/asoc-max98090-reject-invalid-values-in-custom-contro.patch new file mode 100644 index 00000000000..207e9032f93 --- /dev/null +++ b/queue-5.4/asoc-max98090-reject-invalid-values-in-custom-contro.patch @@ -0,0 +1,40 @@ +From aefae1ad6fd70c62a1b114f059ff0b11e9b0c7ff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Apr 2022 20:34:53 +0100 +Subject: ASoC: max98090: Reject invalid values in custom control put() + +From: Mark Brown + +[ 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 +Link: https://lore.kernel.org/r/20220420193454.2647908-1-broonie@kernel.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + 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 6b9d326e11b0..207cdcfb6ebb 100644 +--- a/sound/soc/codecs/max98090.c ++++ b/sound/soc/codecs/max98090.c +@@ -413,6 +413,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-5.4/asoc-ops-validate-input-values-in-snd_soc_put_volsw_.patch b/queue-5.4/asoc-ops-validate-input-values-in-snd_soc_put_volsw_.patch new file mode 100644 index 00000000000..f3e0104d551 --- /dev/null +++ b/queue-5.4/asoc-ops-validate-input-values-in-snd_soc_put_volsw_.patch @@ -0,0 +1,60 @@ +From 52b04ca469ebbb9b709419488ec935764ced2974 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 23 Apr 2022 14:12:39 +0100 +Subject: ASoC: ops: Validate input values in snd_soc_put_volsw_range() + +From: Mark Brown + +[ 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 +Link: https://lore.kernel.org/r/20220423131239.3375261-1-broonie@kernel.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + 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 c88bc6bb41cf..7a37312c8e0c 100644 +--- a/sound/soc/soc-ops.c ++++ b/sound/soc/soc-ops.c +@@ -523,7 +523,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; +@@ -538,6 +546,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-5.4/batman-adv-don-t-skb_split-skbuffs-with-frag_list.patch b/queue-5.4/batman-adv-don-t-skb_split-skbuffs-with-frag_list.patch new file mode 100644 index 00000000000..5b9ace64507 --- /dev/null +++ b/queue-5.4/batman-adv-don-t-skb_split-skbuffs-with-frag_list.patch @@ -0,0 +1,60 @@ +From 70ae3becdd370bbfbdd2379c124bb457b8923294 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 16 Apr 2022 13:51:10 +0200 +Subject: batman-adv: Don't skb_split skbuffs with frag_list + +From: Sven Eckelmann + +[ Upstream commit a063f2fba3fa633a599253b62561051ac185fa99 ] + +The receiving interface might have used GRO to receive more fragments than +MAX_SKB_FRAGS fragments. In this case, these will not be stored in +skb_shinfo(skb)->frags but merged into the frag list. + +batman-adv relies on the function skb_split to split packets up into +multiple smaller packets which are not larger than the MTU on the outgoing +interface. But this function cannot handle frag_list entries and is only +operating on skb_shinfo(skb)->frags. If it is still trying to split such an +skb and xmit'ing it on an interface without support for NETIF_F_FRAGLIST, +then validate_xmit_skb() will try to linearize it. But this fails due to +inconsistent information. And __pskb_pull_tail will trigger a BUG_ON after +skb_copy_bits() returns an error. + +In case of entries in frag_list, just linearize the skb before operating on +it with skb_split(). + +Reported-by: Felix Kaechele +Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol") +Signed-off-by: Sven Eckelmann +Tested-by: Felix Kaechele +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +--- + net/batman-adv/fragmentation.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c +index 0da90e73c79b..f33a7f7a1249 100644 +--- a/net/batman-adv/fragmentation.c ++++ b/net/batman-adv/fragmentation.c +@@ -478,6 +478,17 @@ int batadv_frag_send_packet(struct sk_buff *skb, + goto free_skb; + } + ++ /* GRO might have added fragments to the fragment list instead of ++ * frags[]. But this is not handled by skb_split and must be ++ * linearized to avoid incorrect length information after all ++ * batman-adv fragments were created and submitted to the ++ * hard-interface ++ */ ++ if (skb_has_frag_list(skb) && __skb_linearize(skb)) { ++ ret = -ENOMEM; ++ goto free_skb; ++ } ++ + /* Create one header to be copied to all fragments */ + frag_header.packet_type = BATADV_UNICAST_FRAG; + frag_header.version = BATADV_COMPAT_VERSION; +-- +2.35.1 + diff --git a/queue-5.4/dim-initialize-all-struct-fields.patch b/queue-5.4/dim-initialize-all-struct-fields.patch new file mode 100644 index 00000000000..0a9e736f1b7 --- /dev/null +++ b/queue-5.4/dim-initialize-all-struct-fields.patch @@ -0,0 +1,119 @@ +From 59088a7b069920b14155595418537f1f7cfad9a1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 May 2022 18:10:38 -0700 +Subject: dim: initialize all struct fields +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jesse Brandeburg + +[ Upstream commit ee1444b5e1df4155b591d0d9b1e72853a99ea861 ] + +The W=2 build pointed out that the code wasn't initializing all the +variables in the dim_cq_moder declarations with the struct initializers. +The net change here is zero since these structs were already static +const globals and were initialized with zeros by the compiler, but +removing compiler warnings has value in and of itself. + +lib/dim/net_dim.c: At top level: +lib/dim/net_dim.c:54:9: warning: missing initializer for field ‘comps’ of ‘const struct dim_cq_moder’ [-Wmissing-field-initializers] + 54 | NET_DIM_RX_EQE_PROFILES, + | ^~~~~~~~~~~~~~~~~~~~~~~ +In file included from lib/dim/net_dim.c:6: +./include/linux/dim.h:45:13: note: ‘comps’ declared here + 45 | u16 comps; + | ^~~~~ + +and repeats for the tx struct, and once you fix the comps entry then +the cq_period_mode field needs the same treatment. + +Use the commonly accepted style to indicate to the compiler that we +know what we're doing, and add a comma at the end of each struct +initializer to clean up the issue, and use explicit initializers +for the fields we are initializing which makes the compiler happy. + +While here and fixing these lines, clean up the code slightly with +a fix for the super long lines by removing the word "_MODERATION" from a +couple defines only used in this file. + +Fixes: f8be17b81d44 ("lib/dim: Fix -Wunused-const-variable warnings") +Signed-off-by: Jesse Brandeburg +Link: https://lore.kernel.org/r/20220507011038.14568-1-jesse.brandeburg@intel.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + lib/dim/net_dim.c | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +diff --git a/lib/dim/net_dim.c b/lib/dim/net_dim.c +index a4db51c21266..dae3b51ac3d9 100644 +--- a/lib/dim/net_dim.c ++++ b/lib/dim/net_dim.c +@@ -12,41 +12,41 @@ + * Each profile size must be of NET_DIM_PARAMS_NUM_PROFILES + */ + #define NET_DIM_PARAMS_NUM_PROFILES 5 +-#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256 +-#define NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE 128 ++#define NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE 256 ++#define NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE 128 + #define NET_DIM_DEF_PROFILE_CQE 1 + #define NET_DIM_DEF_PROFILE_EQE 1 + + #define NET_DIM_RX_EQE_PROFILES { \ +- {1, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ +- {8, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ +- {64, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ +- {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ +- {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \ ++ {.usec = 1, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \ ++ {.usec = 8, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \ ++ {.usec = 64, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \ ++ {.usec = 128, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,}, \ ++ {.usec = 256, .pkts = NET_DIM_DEFAULT_RX_CQ_PKTS_FROM_EQE,} \ + } + + #define NET_DIM_RX_CQE_PROFILES { \ +- {2, 256}, \ +- {8, 128}, \ +- {16, 64}, \ +- {32, 64}, \ +- {64, 64} \ ++ {.usec = 2, .pkts = 256,}, \ ++ {.usec = 8, .pkts = 128,}, \ ++ {.usec = 16, .pkts = 64,}, \ ++ {.usec = 32, .pkts = 64,}, \ ++ {.usec = 64, .pkts = 64,} \ + } + + #define NET_DIM_TX_EQE_PROFILES { \ +- {1, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \ +- {8, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \ +- {32, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \ +- {64, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}, \ +- {128, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE} \ ++ {.usec = 1, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \ ++ {.usec = 8, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \ ++ {.usec = 32, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \ ++ {.usec = 64, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,}, \ ++ {.usec = 128, .pkts = NET_DIM_DEFAULT_TX_CQ_PKTS_FROM_EQE,} \ + } + + #define NET_DIM_TX_CQE_PROFILES { \ +- {5, 128}, \ +- {8, 64}, \ +- {16, 32}, \ +- {32, 32}, \ +- {64, 32} \ ++ {.usec = 5, .pkts = 128,}, \ ++ {.usec = 8, .pkts = 64,}, \ ++ {.usec = 16, .pkts = 32,}, \ ++ {.usec = 32, .pkts = 32,}, \ ++ {.usec = 64, .pkts = 32,} \ + } + + static const struct dim_cq_moder +-- +2.35.1 + diff --git a/queue-5.4/drm-nouveau-fix-a-potential-theorical-leak-in-nouvea.patch b/queue-5.4/drm-nouveau-fix-a-potential-theorical-leak-in-nouvea.patch new file mode 100644 index 00000000000..b40115cce43 --- /dev/null +++ b/queue-5.4/drm-nouveau-fix-a-potential-theorical-leak-in-nouvea.patch @@ -0,0 +1,72 @@ +From 14d5e908c5ae573f1ce8262a5ca3c3403e80e332 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Feb 2022 07:03:11 +0100 +Subject: drm/nouveau: Fix a potential theorical leak in + nouveau_get_backlight_name() + +From: Christophe JAILLET + +[ Upstream commit ab244be47a8f111bc82496a8a20c907236e37f95 ] + +If successful ida_simple_get() calls are not undone when needed, some +additional memory may be allocated and wasted. + +Here, an ID between 0 and MAX_INT is required. If this ID is >=100, it is +not taken into account and is wasted. It should be released. + +Instead of calling ida_simple_remove(), take advantage of the 'max' +parameter to require the ID not to be too big. Should it be too big, it +is not allocated and don't need to be freed. + +While at it, use ida_alloc_xxx()/ida_free() instead to +ida_simple_get()/ida_simple_remove(). +The latter is deprecated and more verbose. + +Fixes: db1a0ae21461 ("drm/nouveau/bl: Assign different names to interfaces") +Signed-off-by: Christophe JAILLET +Reviewed-by: Lyude Paul +[Fixed formatting warning from checkpatch] +Signed-off-by: Lyude Paul +Link: https://patchwork.freedesktop.org/patch/msgid/9ba85bca59df6813dc029e743a836451d5173221.1644386541.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c +index c7a94c94dbf3..f2f3280c3a50 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c ++++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c +@@ -51,8 +51,9 @@ static bool + nouveau_get_backlight_name(char backlight_name[BL_NAME_SIZE], + struct nouveau_backlight *bl) + { +- const int nb = ida_simple_get(&bl_ida, 0, 0, GFP_KERNEL); +- if (nb < 0 || nb >= 100) ++ const int nb = ida_alloc_max(&bl_ida, 99, GFP_KERNEL); ++ ++ if (nb < 0) + return false; + if (nb > 0) + snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight%d", nb); +@@ -280,7 +281,7 @@ nouveau_backlight_init(struct drm_connector *connector) + nv_encoder, ops, &props); + if (IS_ERR(bl->dev)) { + if (bl->id >= 0) +- ida_simple_remove(&bl_ida, bl->id); ++ ida_free(&bl_ida, bl->id); + ret = PTR_ERR(bl->dev); + goto fail_alloc; + } +@@ -306,7 +307,7 @@ nouveau_backlight_fini(struct drm_connector *connector) + return; + + if (bl->id >= 0) +- ida_simple_remove(&bl_ida, bl->id); ++ ida_free(&bl_ida, bl->id); + + backlight_device_unregister(bl->dev); + nv_conn->backlight = NULL; +-- +2.35.1 + diff --git a/queue-5.4/gfs2-fix-filesystem-block-deallocation-for-short-wri.patch b/queue-5.4/gfs2-fix-filesystem-block-deallocation-for-short-wri.patch new file mode 100644 index 00000000000..1b46d8be13a --- /dev/null +++ b/queue-5.4/gfs2-fix-filesystem-block-deallocation-for-short-wri.patch @@ -0,0 +1,53 @@ +From bca60816762f7573b581dcc4326139cb98d5e706 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Apr 2022 17:52:39 +0200 +Subject: gfs2: Fix filesystem block deallocation for short writes + +From: Andreas Gruenbacher + +[ Upstream commit d031a8866e709c9d1ee5537a321b6192b4d2dc5b ] + +When a write cannot be carried out in full, gfs2_iomap_end() releases +blocks that have been allocated for this write but haven't been used. + +To compute the end of the allocation, gfs2_iomap_end() incorrectly +rounded the end of the attempted write down to the next block boundary +to arrive at the end of the allocation. It would have to round up, but +the end of the allocation is also available as iomap->offset + +iomap->length, so just use that instead. + +In addition, use round_up() for computing the start of the unused range. + +Fixes: 64bc06bb32ee ("gfs2: iomap buffered write support") +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Sasha Levin +--- + fs/gfs2/bmap.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c +index dec5285a02e9..77a497a4b236 100644 +--- a/fs/gfs2/bmap.c ++++ b/fs/gfs2/bmap.c +@@ -1233,13 +1233,12 @@ static int gfs2_iomap_end(struct inode *inode, loff_t pos, loff_t length, + + if (length != written && (iomap->flags & IOMAP_F_NEW)) { + /* Deallocate blocks that were just allocated. */ +- loff_t blockmask = i_blocksize(inode) - 1; +- loff_t end = (pos + length) & ~blockmask; ++ loff_t hstart = round_up(pos + written, i_blocksize(inode)); ++ loff_t hend = iomap->offset + iomap->length; + +- pos = (pos + written + blockmask) & ~blockmask; +- if (pos < end) { +- truncate_pagecache_range(inode, pos, end - 1); +- punch_hole(ip, pos, end - pos); ++ if (hstart < hend) { ++ truncate_pagecache_range(inode, hstart, hend - 1); ++ punch_hole(ip, hstart, hend - hstart); + } + } + +-- +2.35.1 + diff --git a/queue-5.4/hwmon-f71882fg-fix-negative-temperature.patch b/queue-5.4/hwmon-f71882fg-fix-negative-temperature.patch new file mode 100644 index 00000000000..20f019fd96b --- /dev/null +++ b/queue-5.4/hwmon-f71882fg-fix-negative-temperature.patch @@ -0,0 +1,46 @@ +From 594e31432965524599dc8579ebd2021692502bb4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 Apr 2022 17:07:06 +0800 +Subject: hwmon: (f71882fg) Fix negative temperature + +From: Ji-Ze Hong (Peter Hong) + +[ 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) +Link: https://lore.kernel.org/r/20220418090706.6339-1-hpeter+linux_kernel@gmail.com +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + 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 d09deb409de7..3336ff9e306b 100644 +--- a/drivers/hwmon/f71882fg.c ++++ b/drivers/hwmon/f71882fg.c +@@ -1577,8 +1577,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-5.4/hwmon-ltq-cputemp-restrict-it-to-soc_xway.patch b/queue-5.4/hwmon-ltq-cputemp-restrict-it-to-soc_xway.patch new file mode 100644 index 00000000000..cc5d80993e7 --- /dev/null +++ b/queue-5.4/hwmon-ltq-cputemp-restrict-it-to-soc_xway.patch @@ -0,0 +1,56 @@ +From 8f562617d509171457b4afdacbc75e870b82c3f9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 May 2022 16:47:40 -0700 +Subject: hwmon: (ltq-cputemp) restrict it to SOC_XWAY + +From: Randy Dunlap + +[ Upstream commit 151d6dcbed836270c6c240932da66f147950cbdb ] + +Building with SENSORS_LTQ_CPUTEMP=y with SOC_FALCON=y causes build +errors since FALCON does not support the same features as XWAY. + +Change this symbol to depend on SOC_XWAY since that provides the +necessary interfaces. + +Repairs these build errors: + +../drivers/hwmon/ltq-cputemp.c: In function 'ltq_cputemp_enable': +../drivers/hwmon/ltq-cputemp.c:23:9: error: implicit declaration of function 'ltq_cgu_w32'; did you mean 'ltq_ebu_w32'? [-Werror=implicit-function-declaration] + 23 | ltq_cgu_w32(ltq_cgu_r32(CGU_GPHY1_CR) | CGU_TEMP_PD, CGU_GPHY1_CR); +../drivers/hwmon/ltq-cputemp.c:23:21: error: implicit declaration of function 'ltq_cgu_r32'; did you mean 'ltq_ebu_r32'? [-Werror=implicit-function-declaration] + 23 | ltq_cgu_w32(ltq_cgu_r32(CGU_GPHY1_CR) | CGU_TEMP_PD, CGU_GPHY1_CR); +../drivers/hwmon/ltq-cputemp.c: In function 'ltq_cputemp_probe': +../drivers/hwmon/ltq-cputemp.c:92:31: error: 'SOC_TYPE_VR9_2' undeclared (first use in this function) + 92 | if (ltq_soc_type() != SOC_TYPE_VR9_2) + +Fixes: 7074d0a92758 ("hwmon: (ltq-cputemp) add cpu temp sensor driver") +Signed-off-by: Randy Dunlap +Reported-by: kernel test robot +Cc: Florian Eckert +Cc: Guenter Roeck +Cc: Jean Delvare +Cc: linux-hwmon@vger.kernel.org +Link: https://lore.kernel.org/r/20220509234740.26841-1-rdunlap@infradead.org +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig +index 049563d503b6..4ea742ada36d 100644 +--- a/drivers/hwmon/Kconfig ++++ b/drivers/hwmon/Kconfig +@@ -802,7 +802,7 @@ config SENSORS_LTC4261 + + config SENSORS_LTQ_CPUTEMP + bool "Lantiq cpu temperature sensor driver" +- depends on LANTIQ ++ depends on SOC_XWAY + help + If you say yes here you get support for the temperature + sensor inside your CPU. +-- +2.35.1 + diff --git a/queue-5.4/hwmon-tmp401-add-of-device-id-table.patch b/queue-5.4/hwmon-tmp401-add-of-device-id-table.patch new file mode 100644 index 00000000000..b8f575d5925 --- /dev/null +++ b/queue-5.4/hwmon-tmp401-add-of-device-id-table.patch @@ -0,0 +1,70 @@ +From 229edab46acb3f542cd3adccde7e1615d0e27b46 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 May 2022 13:43:33 +0200 +Subject: hwmon: (tmp401) Add OF device ID table + +From: Camel Guo + +[ Upstream commit 3481551f035725fdc46885425eac3ef9b58ae7b7 ] + +This driver doesn't have of_match_table. This makes the kernel module +tmp401.ko lack alias patterns (e.g: of:N*T*Cti,tmp411) to match DT node +of the supported devices hence this kernel module will not be +automatically loaded. + +After adding of_match_table to this driver, the folllowing alias will be +added into tmp401.ko. +$ modinfo drivers/hwmon/tmp401.ko +filename: drivers/hwmon/tmp401.ko +...... +author: Hans de Goede +alias: of:N*T*Cti,tmp435C* +alias: of:N*T*Cti,tmp435 +alias: of:N*T*Cti,tmp432C* +alias: of:N*T*Cti,tmp432 +alias: of:N*T*Cti,tmp431C* +alias: of:N*T*Cti,tmp431 +alias: of:N*T*Cti,tmp411C* +alias: of:N*T*Cti,tmp411 +alias: of:N*T*Cti,tmp401C* +alias: of:N*T*Cti,tmp401 +...... + +Fixes: af503716ac14 ("i2c: core: report OF style module alias for devices registered via OF") +Signed-off-by: Camel Guo +Link: https://lore.kernel.org/r/20220503114333.456476-1-camel.guo@axis.com +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/tmp401.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c +index fa361d9949db..debcece02dd3 100644 +--- a/drivers/hwmon/tmp401.c ++++ b/drivers/hwmon/tmp401.c +@@ -731,10 +731,21 @@ static int tmp401_probe(struct i2c_client *client, + return 0; + } + ++static const struct of_device_id __maybe_unused tmp4xx_of_match[] = { ++ { .compatible = "ti,tmp401", }, ++ { .compatible = "ti,tmp411", }, ++ { .compatible = "ti,tmp431", }, ++ { .compatible = "ti,tmp432", }, ++ { .compatible = "ti,tmp435", }, ++ { }, ++}; ++MODULE_DEVICE_TABLE(of, tmp4xx_of_match); ++ + static struct i2c_driver tmp401_driver = { + .class = I2C_CLASS_HWMON, + .driver = { + .name = "tmp401", ++ .of_match_table = of_match_ptr(tmp4xx_of_match), + }, + .probe = tmp401_probe, + .id_table = tmp401_id, +-- +2.35.1 + diff --git a/queue-5.4/ipv4-drop-dst-in-multicast-routing-path.patch b/queue-5.4/ipv4-drop-dst-in-multicast-routing-path.patch new file mode 100644 index 00000000000..55bc8888c3d --- /dev/null +++ b/queue-5.4/ipv4-drop-dst-in-multicast-routing-path.patch @@ -0,0 +1,67 @@ +From 50c18fb7c9bf5b34065a2ab6a740c5f0f3f7cb80 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 5 May 2022 14:00:17 +1200 +Subject: ipv4: drop dst in multicast routing path + +From: Lokesh Dhoundiyal + +[ 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 +Signed-off-by: Chris Packham +Reviewed-by: David Ahern +Link: https://lore.kernel.org/r/20220505020017.3111846-1-chris.packham@alliedtelesis.co.nz +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/route.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/ipv4/route.c b/net/ipv4/route.c +index d1feec97fa06..9280e5087159 100644 +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c +@@ -1775,6 +1775,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-5.4/mac80211-reset-mbssid-parameters-upon-connection.patch b/queue-5.4/mac80211-reset-mbssid-parameters-upon-connection.patch new file mode 100644 index 00000000000..2b12b449778 --- /dev/null +++ b/queue-5.4/mac80211-reset-mbssid-parameters-upon-connection.patch @@ -0,0 +1,60 @@ +From c731b60c08c02f7613326d8570ee5d50421ba716 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 28 Apr 2022 10:57:44 +0530 +Subject: mac80211: Reset MBSSID parameters upon connection + +From: Manikanta Pubbisetty + +[ Upstream commit 86af062f40a73bf63321694e6bf637144f0383fe ] + +Currently MBSSID parameters in struct ieee80211_bss_conf +are not reset upon connection. This could be problematic +with some drivers in a scenario where the device first +connects to a non-transmit BSS and then connects to a +transmit BSS of a Multi BSS AP. The MBSSID parameters +which are set after connecting to a non-transmit BSS will +not be reset and the same parameters will be passed on to +the driver during the subsequent connection to a transmit +BSS of a Multi BSS AP. + +For example, firmware running on the ath11k device uses the +Multi BSS data for tracking the beacon of a non-transmit BSS +and reports the driver when there is a beacon miss. If we do +not reset the MBSSID parameters during the subsequent +connection to a transmit BSS, then the driver would have +wrong MBSSID data and FW would be looking for an incorrect +BSSID in the MBSSID beacon of a Multi BSS AP and reports +beacon loss leading to an unstable connection. + +Reset the MBSSID parameters upon every connection to solve this +problem. + +Fixes: 78ac51f81532 ("mac80211: support multi-bssid") +Signed-off-by: Manikanta Pubbisetty +Link: https://lore.kernel.org/r/20220428052744.27040-1-quic_mpubbise@quicinc.com +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/mlme.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c +index ad00f31e2002..5415e566e09d 100644 +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -3406,6 +3406,12 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, + cbss->transmitted_bss->bssid); + bss_conf->bssid_indicator = cbss->max_bssid_indicator; + bss_conf->bssid_index = cbss->bssid_index; ++ } else { ++ bss_conf->nontransmitted = false; ++ memset(bss_conf->transmitter_bssid, 0, ++ sizeof(bss_conf->transmitter_bssid)); ++ bss_conf->bssid_indicator = 0; ++ bss_conf->bssid_index = 0; + } + + /* +-- +2.35.1 + diff --git a/queue-5.4/mac80211_hwsim-call-ieee80211_tx_prepare_skb-under-r.patch b/queue-5.4/mac80211_hwsim-call-ieee80211_tx_prepare_skb-under-r.patch new file mode 100644 index 00000000000..43aaa27bcf0 --- /dev/null +++ b/queue-5.4/mac80211_hwsim-call-ieee80211_tx_prepare_skb-under-r.patch @@ -0,0 +1,52 @@ +From 9ccd592cc4df26ddd6915bafa0c728ef212b16f0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 5 May 2022 23:04:22 +0200 +Subject: mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection + +From: Johannes Berg + +[ 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 +Link: https://lore.kernel.org/r/20220505230421.5f139f9de173.I77ae111a28f7c0e9fd1ebcee7f39dbec5c606770@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + 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 6e1721d53384..ffe27104f654 100644 +--- a/drivers/net/wireless/mac80211_hwsim.c ++++ b/drivers/net/wireless/mac80211_hwsim.c +@@ -2062,11 +2062,13 @@ static void hw_scan_work(struct work_struct *work) + if (req->ie_len) + skb_put_data(probe, 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; + } +@@ -2074,6 +2076,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-5.4/net-emaclite-don-t-advertise-1000base-t-and-do-auto-.patch b/queue-5.4/net-emaclite-don-t-advertise-1000base-t-and-do-auto-.patch new file mode 100644 index 00000000000..454a30f9ced --- /dev/null +++ b/queue-5.4/net-emaclite-don-t-advertise-1000base-t-and-do-auto-.patch @@ -0,0 +1,62 @@ +From 74dfe450dafdc5f9b9eb897376f638158cc9f586 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 May 2022 12:57:49 +0530 +Subject: net: emaclite: Don't advertise 1000BASE-T and do auto negotiation + +From: Shravya Kumbham + +[ Upstream commit b800528b97d0adc3a5ba42d78a8b0d3f07a31f44 ] + +In xemaclite_open() function we are setting the max speed of +emaclite to 100Mb using phy_set_max_speed() function so, +there is no need to write the advertising registers to stop +giga-bit speed and the phy_start() function starts the +auto-negotiation so, there is no need to handle it separately +using advertising registers. Remove the phy_read and phy_write +of advertising registers in xemaclite_open() function. + +Signed-off-by: Shravya Kumbham +Signed-off-by: Radhey Shyam Pandey +Reviewed-by: Andrew Lunn +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c +index bec09008997d..6e5ea68b6a7e 100644 +--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c ++++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c +@@ -932,8 +932,6 @@ static int xemaclite_open(struct net_device *dev) + xemaclite_disable_interrupts(lp); + + if (lp->phy_node) { +- u32 bmcr; +- + lp->phy_dev = of_phy_connect(lp->ndev, lp->phy_node, + xemaclite_adjust_link, 0, + PHY_INTERFACE_MODE_MII); +@@ -944,19 +942,6 @@ static int xemaclite_open(struct net_device *dev) + + /* EmacLite doesn't support giga-bit speeds */ + phy_set_max_speed(lp->phy_dev, SPEED_100); +- +- /* Don't advertise 1000BASE-T Full/Half duplex speeds */ +- phy_write(lp->phy_dev, MII_CTRL1000, 0); +- +- /* Advertise only 10 and 100mbps full/half duplex speeds */ +- phy_write(lp->phy_dev, MII_ADVERTISE, ADVERTISE_ALL | +- ADVERTISE_CSMA); +- +- /* Restart auto negotiation */ +- bmcr = phy_read(lp->phy_dev, MII_BMCR); +- bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART); +- phy_write(lp->phy_dev, MII_BMCR, bmcr); +- + phy_start(lp->phy_dev); + } + +-- +2.35.1 + diff --git a/queue-5.4/net-fix-features-skip-in-for_each_netdev_feature.patch b/queue-5.4/net-fix-features-skip-in-for_each_netdev_feature.patch new file mode 100644 index 00000000000..a25dd79cd1e --- /dev/null +++ b/queue-5.4/net-fix-features-skip-in-for_each_netdev_feature.patch @@ -0,0 +1,49 @@ +From e78dcde975ab020b0c52d2879c9240d196fcd7f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 May 2022 11:09:14 +0300 +Subject: net: Fix features skip in for_each_netdev_feature() + +From: Tariq Toukan + +[ 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 +Reviewed-by: Gal Pressman +Link: https://lore.kernel.org/r/20220504080914.1918-1-tariqt@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + 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 640e7279f161..75be8886783e 100644 +--- a/include/linux/netdev_features.h ++++ b/include/linux/netdev_features.h +@@ -151,7 +151,7 @@ enum { + #define NETIF_F_HW_TLS_TX __NETIF_F(HW_TLS_TX) + #define NETIF_F_HW_TLS_RX __NETIF_F(HW_TLS_RX) + +-/* 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) + { +@@ -170,7 +170,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-5.4/net-sched-act_pedit-really-ensure-the-skb-is-writabl.patch b/queue-5.4/net-sched-act_pedit-really-ensure-the-skb-is-writabl.patch new file mode 100644 index 00000000000..64c973c8f3f --- /dev/null +++ b/queue-5.4/net-sched-act_pedit-really-ensure-the-skb-is-writabl.patch @@ -0,0 +1,123 @@ +From d1046f596af73c5bb9f18f11395b6152acc33ce2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 May 2022 16:57:34 +0200 +Subject: net/sched: act_pedit: really ensure the skb is writable + +From: Paolo Abeni + +[ Upstream commit 8b796475fd7882663a870456466a4fb315cc1bd6 ] + +Currently pedit tries to ensure that the accessed skb offset +is writable via skb_unclone(). The action potentially allows +touching any skb bytes, so it may end-up modifying shared data. + +The above causes some sporadic MPTCP self-test failures, due to +this code: + + tc -n $ns2 filter add dev ns2eth$i egress \ + protocol ip prio 1000 \ + handle 42 fw \ + action pedit munge offset 148 u8 invert \ + pipe csum tcp \ + index 100 + +The above modifies a data byte outside the skb head and the skb is +a cloned one, carrying a TCP output packet. + +This change addresses the issue by keeping track of a rough +over-estimate highest skb offset accessed by the action and ensuring +such offset is really writable. + +Note that this may cause performance regressions in some scenarios, +but hopefully pedit is not in the critical path. + +Fixes: db2c24175d14 ("act_pedit: access skb->data safely") +Acked-by: Mat Martineau +Tested-by: Geliang Tang +Signed-off-by: Paolo Abeni +Acked-by: Jamal Hadi Salim +Link: https://lore.kernel.org/r/1fcf78e6679d0a287dd61bb0f04730ce33b3255d.1652194627.git.pabeni@redhat.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + include/net/tc_act/tc_pedit.h | 1 + + net/sched/act_pedit.c | 26 ++++++++++++++++++++++---- + 2 files changed, 23 insertions(+), 4 deletions(-) + +diff --git a/include/net/tc_act/tc_pedit.h b/include/net/tc_act/tc_pedit.h +index 748cf87a4d7e..3e02709a1df6 100644 +--- a/include/net/tc_act/tc_pedit.h ++++ b/include/net/tc_act/tc_pedit.h +@@ -14,6 +14,7 @@ struct tcf_pedit { + struct tc_action common; + unsigned char tcfp_nkeys; + unsigned char tcfp_flags; ++ u32 tcfp_off_max_hint; + struct tc_pedit_key *tcfp_keys; + struct tcf_pedit_key_ex *tcfp_keys_ex; + }; +diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c +index ff4f2437b592..305cb190e997 100644 +--- a/net/sched/act_pedit.c ++++ b/net/sched/act_pedit.c +@@ -148,7 +148,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla, + struct nlattr *pattr; + struct tcf_pedit *p; + int ret = 0, err; +- int ksize; ++ int i, ksize; + u32 index; + + if (!nla) { +@@ -227,6 +227,18 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla, + p->tcfp_nkeys = parm->nkeys; + } + memcpy(p->tcfp_keys, parm->keys, ksize); ++ p->tcfp_off_max_hint = 0; ++ for (i = 0; i < p->tcfp_nkeys; ++i) { ++ u32 cur = p->tcfp_keys[i].off; ++ ++ /* The AT option can read a single byte, we can bound the actual ++ * value with uchar max. ++ */ ++ cur += (0xff & p->tcfp_keys[i].offmask) >> p->tcfp_keys[i].shift; ++ ++ /* Each key touches 4 bytes starting from the computed offset */ ++ p->tcfp_off_max_hint = max(p->tcfp_off_max_hint, cur + 4); ++ } + + p->tcfp_flags = parm->flags; + goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch); +@@ -307,13 +319,18 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a, + struct tcf_result *res) + { + struct tcf_pedit *p = to_pedit(a); ++ u32 max_offset; + int i; + +- if (skb_unclone(skb, GFP_ATOMIC)) +- return p->tcf_action; +- + spin_lock(&p->tcf_lock); + ++ max_offset = (skb_transport_header_was_set(skb) ? ++ skb_transport_offset(skb) : ++ skb_network_offset(skb)) + ++ p->tcfp_off_max_hint; ++ if (skb_ensure_writable(skb, min(skb->len, max_offset))) ++ goto unlock; ++ + tcf_lastuse_update(&p->tcf_tm); + + if (p->tcfp_nkeys > 0) { +@@ -402,6 +419,7 @@ static int tcf_pedit_act(struct sk_buff *skb, const struct tc_action *a, + p->tcf_qstats.overlimits++; + done: + bstats_update(&p->tcf_bstats, skb); ++unlock: + spin_unlock(&p->tcf_lock); + return p->tcf_action; + } +-- +2.35.1 + diff --git a/queue-5.4/net-sfc-ef10-fix-memory-leak-in-efx_ef10_mtd_probe.patch b/queue-5.4/net-sfc-ef10-fix-memory-leak-in-efx_ef10_mtd_probe.patch new file mode 100644 index 00000000000..b730e8b3545 --- /dev/null +++ b/queue-5.4/net-sfc-ef10-fix-memory-leak-in-efx_ef10_mtd_probe.patch @@ -0,0 +1,72 @@ +From f1653d6e67ecb4728232d6a3b8f6987bf5918a06 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 12 May 2022 05:47:09 +0000 +Subject: net: sfc: ef10: fix memory leak in efx_ef10_mtd_probe() + +From: Taehee Yoo + +[ 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: + [] kmalloc_order_trace+0x19/0x120 + [] __kmalloc+0x20e/0x250 + [] efx_ef10_mtd_probe+0x11f/0x270 [sfc] + [] efx_pci_probe.cold.17+0x3df/0x53d [sfc] + [] local_pci_probe+0xdc/0x170 + [] pci_device_probe+0x235/0x680 + [] really_probe+0x1c2/0x8f0 + [] __driver_probe_device+0x2ab/0x460 + [] driver_probe_device+0x4a/0x120 + [] __driver_attach+0x16e/0x320 + [] bus_for_each_dev+0x110/0x190 + [] bus_add_driver+0x39e/0x560 + [] driver_register+0x18e/0x310 + [] 0xffffffffc02e2055 + [] do_one_initcall+0xc3/0x450 + [] do_init_module+0x1b4/0x700 + +Acked-by: Martin Habets +Fixes: 8127d661e77f ("sfc: Add support for Solarflare SFC9100 family") +Signed-off-by: Taehee Yoo +Link: https://lore.kernel.org/r/20220512054709.12513-1-ap420073@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + 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 0ec13f520e90..936e64dd81b5 100644 +--- a/drivers/net/ethernet/sfc/ef10.c ++++ b/drivers/net/ethernet/sfc/ef10.c +@@ -6160,6 +6160,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-5.4/net-smc-non-blocking-recvmsg-return-eagain-when-no-d.patch b/queue-5.4/net-smc-non-blocking-recvmsg-return-eagain-when-no-d.patch new file mode 100644 index 00000000000..be04f60a94f --- /dev/null +++ b/queue-5.4/net-smc-non-blocking-recvmsg-return-eagain-when-no-d.patch @@ -0,0 +1,49 @@ +From 1b845f40723eb84e1c6be8c67b9d455ac718afbe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 12 May 2022 11:08:20 +0800 +Subject: net/smc: non blocking recvmsg() return -EAGAIN when no data and + signal_pending + +From: Guangguan Wang + +[ Upstream commit f3c46e41b32b6266cf60b0985c61748f53bf1c61 ] + +Non blocking sendmsg will return -EAGAIN when any signal pending +and no send space left, while non blocking recvmsg return -EINTR +when signal pending and no data received. This may makes confused. +As TCP returns -EAGAIN in the conditions described above. Align the +behavior of smc with TCP. + +Fixes: 846e344eb722 ("net/smc: add receive timeout check") +Signed-off-by: Guangguan Wang +Reviewed-by: Tony Lu +Acked-by: Karsten Graul +Link: https://lore.kernel.org/r/20220512030820.73848-1-guangguan.wang@linux.alibaba.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/smc/smc_rx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c +index 97e8369002d7..9e89bd1f706b 100644 +--- a/net/smc/smc_rx.c ++++ b/net/smc/smc_rx.c +@@ -348,12 +348,12 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, + } + break; + } ++ if (!timeo) ++ return -EAGAIN; + if (signal_pending(current)) { + read_done = sock_intr_errno(timeo); + break; + } +- if (!timeo) +- return -EAGAIN; + } + + if (!smc_rx_data_available(conn)) { +-- +2.35.1 + diff --git a/queue-5.4/netlink-do-not-reset-transport-header-in-netlink_rec.patch b/queue-5.4/netlink-do-not-reset-transport-header-in-netlink_rec.patch new file mode 100644 index 00000000000..f1f7fc18f61 --- /dev/null +++ b/queue-5.4/netlink-do-not-reset-transport-header-in-netlink_rec.patch @@ -0,0 +1,76 @@ +From 6666f3fbb5ee1e7c35e8c4548fdf1d1ac35dee83 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 5 May 2022 09:19:46 -0700 +Subject: netlink: do not reset transport header in netlink_recvmsg() + +From: Eric Dumazet + +[ 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 +Reported-by: syzbot +Link: https://lore.kernel.org/r/20220505161946.2867638-1-eric.dumazet@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + 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 8aefc52542a0..86b70385dce3 100644 +--- a/net/netlink/af_netlink.c ++++ b/net/netlink/af_netlink.c +@@ -1987,7 +1987,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-5.4/s390-ctcm-fix-potential-memory-leak.patch b/queue-5.4/s390-ctcm-fix-potential-memory-leak.patch new file mode 100644 index 00000000000..834cd9164ba --- /dev/null +++ b/queue-5.4/s390-ctcm-fix-potential-memory-leak.patch @@ -0,0 +1,67 @@ +From 1d55bb893dc3a9cc0a66c4c270a14b55178b6560 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 May 2022 09:05:07 +0200 +Subject: s390/ctcm: fix potential memory leak + +From: Alexandra Winter + +[ 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 +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + 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 ab316baa8284..d766002bc5be 100644 +--- a/drivers/s390/net/ctcm_mpc.c ++++ b/drivers/s390/net/ctcm_mpc.c +@@ -626,8 +626,6 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) + ctcm_clear_busy_do(dev); + } + +- kfree(mpcginfo); +- + return; + + } +@@ -1206,10 +1204,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: + +@@ -1991,7 +1989,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, +@@ -2052,7 +2049,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-5.4/s390-ctcm-fix-variable-dereferenced-before-check.patch b/queue-5.4/s390-ctcm-fix-variable-dereferenced-before-check.patch new file mode 100644 index 00000000000..7ac5ff1dfa2 --- /dev/null +++ b/queue-5.4/s390-ctcm-fix-variable-dereferenced-before-check.patch @@ -0,0 +1,44 @@ +From fdb3ebc12d9f7b63fe8f2a219691578f1743de23 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 May 2022 09:05:06 +0200 +Subject: s390/ctcm: fix variable dereferenced before check + +From: Alexandra Winter + +[ 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 +Signed-off-by: Alexandra Winter +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + 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 ded1930a00b2..e3813a7aa5e6 100644 +--- a/drivers/s390/net/ctcm_sysfs.c ++++ b/drivers/s390/net/ctcm_sysfs.c +@@ -39,11 +39,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-5.4/s390-disable-warray-bounds.patch b/queue-5.4/s390-disable-warray-bounds.patch new file mode 100644 index 00000000000..3ea88d644f4 --- /dev/null +++ b/queue-5.4/s390-disable-warray-bounds.patch @@ -0,0 +1,54 @@ +From f45cdccfef1cffe876505b2be5d9d0cbbed7834e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 25 Apr 2022 14:17:42 +0200 +Subject: s390: disable -Warray-bounds + +From: Sven Schnelle + +[ Upstream commit 8b202ee218395319aec1ef44f72043e1fbaccdd6 ] + +gcc-12 shows a lot of array bound warnings on s390. This is caused +by the S390_lowcore macro which uses a hardcoded address of 0. + +Wrapping that with absolute_pointer() works, but gcc no longer knows +that a 12 bit displacement is sufficient to access lowcore. So it +emits instructions like 'lghi %r1,0; l %rx,xxx(%r1)' instead of a +single load/store instruction. As s390 stores variables often +read/written in lowcore, this is considered problematic. Therefore +disable -Warray-bounds on s390 for gcc-12 for the time being, until +there is a better solution. + +Signed-off-by: Sven Schnelle +Link: https://lore.kernel.org/r/yt9dzgkelelc.fsf@linux.ibm.com +Link: https://lore.kernel.org/r/20220422134308.1613610-1-svens@linux.ibm.com +Link: https://lore.kernel.org/r/20220425121742.3222133-1-svens@linux.ibm.com +Signed-off-by: Heiko Carstens +Signed-off-by: Sasha Levin +--- + arch/s390/Makefile | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/arch/s390/Makefile b/arch/s390/Makefile +index 2faaf456956a..71e3d7c0b870 100644 +--- a/arch/s390/Makefile ++++ b/arch/s390/Makefile +@@ -31,6 +31,16 @@ KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding) + KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member) + KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g) + KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,)) ++ ++ifdef CONFIG_CC_IS_GCC ++ ifeq ($(call cc-ifversion, -ge, 1200, y), y) ++ ifeq ($(call cc-ifversion, -lt, 1300, y), y) ++ KBUILD_CFLAGS += $(call cc-disable-warning, array-bounds) ++ KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, array-bounds) ++ endif ++ endif ++endif ++ + UTS_MACHINE := s390x + STACK_SIZE := $(if $(CONFIG_KASAN),65536,16384) + CHECKFLAGS += -D__s390__ -D__s390x__ +-- +2.35.1 + diff --git a/queue-5.4/s390-lcs-fix-variable-dereferenced-before-check.patch b/queue-5.4/s390-lcs-fix-variable-dereferenced-before-check.patch new file mode 100644 index 00000000000..857a16d982a --- /dev/null +++ b/queue-5.4/s390-lcs-fix-variable-dereferenced-before-check.patch @@ -0,0 +1,42 @@ +From 57a0118d269a9b77f0e6b6d4938a51ef7655e594 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 May 2022 09:05:08 +0200 +Subject: s390/lcs: fix variable dereferenced before check + +From: Alexandra Winter + +[ 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 +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + 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 8f08b0a2917c..4eec7bfb5de9 100644 +--- a/drivers/s390/net/lcs.c ++++ b/drivers/s390/net/lcs.c +@@ -1735,10 +1735,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-5.4/series b/queue-5.4/series new file mode 100644 index 00000000000..6b42920e7e7 --- /dev/null +++ b/queue-5.4/series @@ -0,0 +1,24 @@ +batman-adv-don-t-skb_split-skbuffs-with-frag_list.patch +hwmon-tmp401-add-of-device-id-table.patch +mac80211-reset-mbssid-parameters-upon-connection.patch +net-fix-features-skip-in-for_each_netdev_feature.patch +ipv4-drop-dst-in-multicast-routing-path.patch +drm-nouveau-fix-a-potential-theorical-leak-in-nouvea.patch +netlink-do-not-reset-transport-header-in-netlink_rec.patch +mac80211_hwsim-call-ieee80211_tx_prepare_skb-under-r.patch +dim-initialize-all-struct-fields.patch +hwmon-ltq-cputemp-restrict-it-to-soc_xway.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-sched-act_pedit-really-ensure-the-skb-is-writabl.patch +net-smc-non-blocking-recvmsg-return-eagain-when-no-d.patch +net-sfc-ef10-fix-memory-leak-in-efx_ef10_mtd_probe.patch +gfs2-fix-filesystem-block-deallocation-for-short-wri.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 +s390-disable-warray-bounds.patch +net-emaclite-don-t-advertise-1000base-t-and-do-auto-.patch +tcp-resalt-the-secret-every-10-seconds.patch diff --git a/queue-5.4/tcp-resalt-the-secret-every-10-seconds.patch b/queue-5.4/tcp-resalt-the-secret-every-10-seconds.patch new file mode 100644 index 00000000000..bcc249b40da --- /dev/null +++ b/queue-5.4/tcp-resalt-the-secret-every-10-seconds.patch @@ -0,0 +1,70 @@ +From 3b7ab1f208bb69cf29bfd1a7ed474f0a59cb7ca4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 May 2022 10:46:10 +0200 +Subject: tcp: resalt the secret every 10 seconds + +From: Eric Dumazet + +[ Upstream commit 4dfa9b438ee34caca4e6a4e5e961641807367f6f ] + +In order to limit the ability for an observer to recognize the source +ports sequence used to contact a set of destinations, we should +periodically shuffle the secret. 10 seconds looks effective enough +without causing particular issues. + +Cc: Moshe Kol +Cc: Yossi Gilad +Cc: Amit Klein +Cc: Jason A. Donenfeld +Tested-by: Willy Tarreau +Signed-off-by: Eric Dumazet +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/core/secure_seq.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c +index 7b6b1d2c3d10..2f9796a1a63f 100644 +--- a/net/core/secure_seq.c ++++ b/net/core/secure_seq.c +@@ -23,6 +23,8 @@ + static siphash_key_t net_secret __read_mostly; + static siphash_key_t ts_secret __read_mostly; + ++#define EPHEMERAL_PORT_SHUFFLE_PERIOD (10 * HZ) ++ + static __always_inline void net_secret_init(void) + { + net_get_random_once(&net_secret, sizeof(net_secret)); +@@ -101,11 +103,13 @@ u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr, + const struct { + struct in6_addr saddr; + struct in6_addr daddr; ++ unsigned int timeseed; + __be16 dport; + } __aligned(SIPHASH_ALIGNMENT) combined = { + .saddr = *(struct in6_addr *)saddr, + .daddr = *(struct in6_addr *)daddr, +- .dport = dport ++ .timeseed = jiffies / EPHEMERAL_PORT_SHUFFLE_PERIOD, ++ .dport = dport, + }; + net_secret_init(); + return siphash(&combined, offsetofend(typeof(combined), dport), +@@ -146,8 +150,10 @@ EXPORT_SYMBOL_GPL(secure_tcp_seq); + u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport) + { + net_secret_init(); +- return siphash_3u32((__force u32)saddr, (__force u32)daddr, +- (__force u16)dport, &net_secret); ++ return siphash_4u32((__force u32)saddr, (__force u32)daddr, ++ (__force u16)dport, ++ jiffies / EPHEMERAL_PORT_SHUFFLE_PERIOD, ++ &net_secret); + } + EXPORT_SYMBOL_GPL(secure_ipv4_port_ephemeral); + #endif +-- +2.35.1 +