From: Sasha Levin Date: Fri, 5 Jul 2024 19:20:42 +0000 (-0400) Subject: Fixes for 6.1 X-Git-Tag: v6.6.38~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5fc329c5096365389c240815a0ea8097f90d367;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.1 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/bpf-avoid-uninitialized-value-in-bpf_core_read_bitfi.patch b/queue-6.1/bpf-avoid-uninitialized-value-in-bpf_core_read_bitfi.patch new file mode 100644 index 00000000000..2f50198e920 --- /dev/null +++ b/queue-6.1/bpf-avoid-uninitialized-value-in-bpf_core_read_bitfi.patch @@ -0,0 +1,59 @@ +From dde5e65a5ba87885e6ad44709b1b8215417bf5ac Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 May 2024 12:13:13 +0200 +Subject: bpf: Avoid uninitialized value in BPF_CORE_READ_BITFIELD + +From: Jose E. Marchesi + +[ Upstream commit 009367099eb61a4fc2af44d4eb06b6b4de7de6db ] + +[Changes from V1: + - Use a default branch in the switch statement to initialize `val'.] + +GCC warns that `val' may be used uninitialized in the +BPF_CRE_READ_BITFIELD macro, defined in bpf_core_read.h as: + + [...] + unsigned long long val; \ + [...] \ + switch (__CORE_RELO(s, field, BYTE_SIZE)) { \ + case 1: val = *(const unsigned char *)p; break; \ + case 2: val = *(const unsigned short *)p; break; \ + case 4: val = *(const unsigned int *)p; break; \ + case 8: val = *(const unsigned long long *)p; break; \ + } \ + [...] + val; \ + } \ + +This patch adds a default entry in the switch statement that sets +`val' to zero in order to avoid the warning, and random values to be +used in case __builtin_preserve_field_info returns unexpected values +for BPF_FIELD_BYTE_SIZE. + +Tested in bpf-next master. +No regressions. + +Signed-off-by: Jose E. Marchesi +Signed-off-by: Andrii Nakryiko +Link: https://lore.kernel.org/bpf/20240508101313.16662-1-jose.marchesi@oracle.com +Signed-off-by: Sasha Levin +--- + tools/lib/bpf/bpf_core_read.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/lib/bpf/bpf_core_read.h b/tools/lib/bpf/bpf_core_read.h +index 496e6a8ee0dc9..41740ae8aad73 100644 +--- a/tools/lib/bpf/bpf_core_read.h ++++ b/tools/lib/bpf/bpf_core_read.h +@@ -102,6 +102,7 @@ enum bpf_enum_value_kind { + case 2: val = *(const unsigned short *)p; break; \ + case 4: val = *(const unsigned int *)p; break; \ + case 8: val = *(const unsigned long long *)p; break; \ ++ default: val = 0; break; \ + } \ + val <<= __CORE_RELO(s, field, LSHIFT_U64); \ + if (__CORE_RELO(s, field, SIGNED)) \ +-- +2.43.0 + diff --git a/queue-6.1/btrfs-scrub-initialize-ret-in-scrub_simple_mirror-to.patch b/queue-6.1/btrfs-scrub-initialize-ret-in-scrub_simple_mirror-to.patch new file mode 100644 index 00000000000..f2beefa6277 --- /dev/null +++ b/queue-6.1/btrfs-scrub-initialize-ret-in-scrub_simple_mirror-to.patch @@ -0,0 +1,44 @@ +From 591c7b1456e853d4447138443a42baca5a9b11a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 10:34:17 +0800 +Subject: btrfs: scrub: initialize ret in scrub_simple_mirror() to fix + compilation warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Lu Yao + +[ Upstream commit b4e585fffc1cf877112ed231a91f089e85688c2a ] + +The following error message is displayed: + ../fs/btrfs/scrub.c:2152:9: error: ‘ret’ may be used uninitialized + in this function [-Werror=maybe-uninitialized]" + +Compiler version: gcc version: (Debian 10.2.1-6) 10.2.1 20210110 + +Reviewed-by: Boris Burkov +Signed-off-by: Lu Yao +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/scrub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c +index 12a2b1e3f1e35..f48895a9b165e 100644 +--- a/fs/btrfs/scrub.c ++++ b/fs/btrfs/scrub.c +@@ -3407,7 +3407,7 @@ static int scrub_simple_mirror(struct scrub_ctx *sctx, + const u32 max_length = SZ_64K; + struct btrfs_path path = { 0 }; + u64 cur_logical = logical_start; +- int ret; ++ int ret = 0; + + /* The range must be inside the bg */ + ASSERT(logical_start >= bg->start && logical_end <= bg->start + bg->length); +-- +2.43.0 + diff --git a/queue-6.1/cdrom-rearrange-last_media_change-check-to-avoid-uni.patch b/queue-6.1/cdrom-rearrange-last_media_change-check-to-avoid-uni.patch new file mode 100644 index 00000000000..a9e6b17df45 --- /dev/null +++ b/queue-6.1/cdrom-rearrange-last_media_change-check-to-avoid-uni.patch @@ -0,0 +1,71 @@ +From e90bc599777d5e60cddedcb40094659e1be31061 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 23:25:20 +0100 +Subject: cdrom: rearrange last_media_change check to avoid unintentional + overflow + +From: Justin Stitt + +[ Upstream commit efb905aeb44b0e99c0e6b07865b1885ae0471ebf ] + +When running syzkaller with the newly reintroduced signed integer wrap +sanitizer we encounter this splat: + +[ 366.015950] UBSAN: signed-integer-overflow in ../drivers/cdrom/cdrom.c:2361:33 +[ 366.021089] -9223372036854775808 - 346321 cannot be represented in type '__s64' (aka 'long long') +[ 366.025894] program syz-executor.4 is using a deprecated SCSI ioctl, please convert it to SG_IO +[ 366.027502] CPU: 5 PID: 28472 Comm: syz-executor.7 Not tainted 6.8.0-rc2-00035-gb3ef86b5a957 #1 +[ 366.027512] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 +[ 366.027518] Call Trace: +[ 366.027523] +[ 366.027533] dump_stack_lvl+0x93/0xd0 +[ 366.027899] handle_overflow+0x171/0x1b0 +[ 366.038787] ata1.00: invalid multi_count 32 ignored +[ 366.043924] cdrom_ioctl+0x2c3f/0x2d10 +[ 366.063932] ? __pm_runtime_resume+0xe6/0x130 +[ 366.071923] sr_block_ioctl+0x15d/0x1d0 +[ 366.074624] ? __pfx_sr_block_ioctl+0x10/0x10 +[ 366.077642] blkdev_ioctl+0x419/0x500 +[ 366.080231] ? __pfx_blkdev_ioctl+0x10/0x10 +... + +Historically, the signed integer overflow sanitizer did not work in the +kernel due to its interaction with `-fwrapv` but this has since been +changed [1] in the newest version of Clang. It was re-enabled in the +kernel with Commit 557f8c582a9ba8ab ("ubsan: Reintroduce signed overflow +sanitizer"). + +Let's rearrange the check to not perform any arithmetic, thus not +tripping the sanitizer. + +Link: https://github.com/llvm/llvm-project/pull/82432 [1] +Closes: https://github.com/KSPP/linux/issues/354 +Cc: linux-hardening@vger.kernel.org +Signed-off-by: Justin Stitt +Link: https://lore.kernel.org/lkml/20240507-b4-sio-ata1-v1-1-810ffac6080a@google.com +Reviewed-by: Phillip Potter +Link: https://lore.kernel.org/lkml/ZjqU0fbzHrlnad8D@equinox +Signed-off-by: Phillip Potter +Link: https://lore.kernel.org/r/20240507222520.1445-2-phil@philpotter.co.uk +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/cdrom/cdrom.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c +index 416f723a2dbb3..8e3eeb96db63e 100644 +--- a/drivers/cdrom/cdrom.c ++++ b/drivers/cdrom/cdrom.c +@@ -2372,7 +2372,7 @@ static int cdrom_ioctl_timed_media_change(struct cdrom_device_info *cdi, + return -EFAULT; + + tmp_info.media_flags = 0; +- if (tmp_info.last_media_change - cdi->last_media_change_ms < 0) ++ if (cdi->last_media_change_ms > tmp_info.last_media_change) + tmp_info.media_flags |= MEDIA_CHANGED_FLAG; + + tmp_info.last_media_change = cdi->last_media_change_ms; +-- +2.43.0 + diff --git a/queue-6.1/crypto-aead-cipher-zeroize-key-buffer-after-use.patch b/queue-6.1/crypto-aead-cipher-zeroize-key-buffer-after-use.patch new file mode 100644 index 00000000000..b083b6395f0 --- /dev/null +++ b/queue-6.1/crypto-aead-cipher-zeroize-key-buffer-after-use.patch @@ -0,0 +1,53 @@ +From 06e34bd77c96ed944410fd21b060190d39f36a05 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Apr 2024 22:19:15 +0000 +Subject: crypto: aead,cipher - zeroize key buffer after use + +From: Hailey Mothershead + +[ Upstream commit 23e4099bdc3c8381992f9eb975c79196d6755210 ] + +I.G 9.7.B for FIPS 140-3 specifies that variables temporarily holding +cryptographic information should be zeroized once they are no longer +needed. Accomplish this by using kfree_sensitive for buffers that +previously held the private key. + +Signed-off-by: Hailey Mothershead +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + crypto/aead.c | 3 +-- + crypto/cipher.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/crypto/aead.c b/crypto/aead.c +index 16991095270d2..c4ece86c45bc4 100644 +--- a/crypto/aead.c ++++ b/crypto/aead.c +@@ -35,8 +35,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key, + alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); + memcpy(alignbuffer, key, keylen); + ret = crypto_aead_alg(tfm)->setkey(tfm, alignbuffer, keylen); +- memset(alignbuffer, 0, keylen); +- kfree(buffer); ++ kfree_sensitive(buffer); + return ret; + } + +diff --git a/crypto/cipher.c b/crypto/cipher.c +index b47141ed4a9f3..395f0c2fbb9ff 100644 +--- a/crypto/cipher.c ++++ b/crypto/cipher.c +@@ -34,8 +34,7 @@ static int setkey_unaligned(struct crypto_cipher *tfm, const u8 *key, + alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); + memcpy(alignbuffer, key, keylen); + ret = cia->cia_setkey(crypto_cipher_tfm(tfm), alignbuffer, keylen); +- memset(alignbuffer, 0, keylen); +- kfree(buffer); ++ kfree_sensitive(buffer); + return ret; + + } +-- +2.43.0 + diff --git a/queue-6.1/crypto-hisilicon-debugfs-fix-debugfs-uninit-process-.patch b/queue-6.1/crypto-hisilicon-debugfs-fix-debugfs-uninit-process-.patch new file mode 100644 index 00000000000..4ebb189fc4c --- /dev/null +++ b/queue-6.1/crypto-hisilicon-debugfs-fix-debugfs-uninit-process-.patch @@ -0,0 +1,82 @@ +From dad335add140662986a297e76838fda056741f73 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Apr 2024 15:59:53 +0800 +Subject: crypto: hisilicon/debugfs - Fix debugfs uninit process issue + +From: Chenghai Huang + +[ Upstream commit 8be0913389718e8d27c4f1d4537b5e1b99ed7739 ] + +During the zip probe process, the debugfs failure does not stop +the probe. When debugfs initialization fails, jumping to the +error branch will also release regs, in addition to its own +rollback operation. + +As a result, it may be released repeatedly during the regs +uninit process. Therefore, the null check needs to be added to +the regs uninit process. + +Signed-off-by: Chenghai Huang +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/hisilicon/debugfs.c | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/drivers/crypto/hisilicon/debugfs.c b/drivers/crypto/hisilicon/debugfs.c +index 13bec8b2d7237..a1d41ee39816b 100644 +--- a/drivers/crypto/hisilicon/debugfs.c ++++ b/drivers/crypto/hisilicon/debugfs.c +@@ -744,8 +744,14 @@ static void dfx_regs_uninit(struct hisi_qm *qm, + { + int i; + ++ if (!dregs) ++ return; ++ + /* Setting the pointer is NULL to prevent double free */ + for (i = 0; i < reg_len; i++) { ++ if (!dregs[i].regs) ++ continue; ++ + kfree(dregs[i].regs); + dregs[i].regs = NULL; + } +@@ -795,14 +801,21 @@ static struct dfx_diff_registers *dfx_regs_init(struct hisi_qm *qm, + static int qm_diff_regs_init(struct hisi_qm *qm, + struct dfx_diff_registers *dregs, u32 reg_len) + { ++ int ret; ++ + qm->debug.qm_diff_regs = dfx_regs_init(qm, qm_diff_regs, ARRAY_SIZE(qm_diff_regs)); +- if (IS_ERR(qm->debug.qm_diff_regs)) +- return PTR_ERR(qm->debug.qm_diff_regs); ++ if (IS_ERR(qm->debug.qm_diff_regs)) { ++ ret = PTR_ERR(qm->debug.qm_diff_regs); ++ qm->debug.qm_diff_regs = NULL; ++ return ret; ++ } + + qm->debug.acc_diff_regs = dfx_regs_init(qm, dregs, reg_len); + if (IS_ERR(qm->debug.acc_diff_regs)) { + dfx_regs_uninit(qm, qm->debug.qm_diff_regs, ARRAY_SIZE(qm_diff_regs)); +- return PTR_ERR(qm->debug.acc_diff_regs); ++ ret = PTR_ERR(qm->debug.acc_diff_regs); ++ qm->debug.acc_diff_regs = NULL; ++ return ret; + } + + return 0; +@@ -843,7 +856,9 @@ static int qm_last_regs_init(struct hisi_qm *qm) + static void qm_diff_regs_uninit(struct hisi_qm *qm, u32 reg_len) + { + dfx_regs_uninit(qm, qm->debug.acc_diff_regs, reg_len); ++ qm->debug.acc_diff_regs = NULL; + dfx_regs_uninit(qm, qm->debug.qm_diff_regs, ARRAY_SIZE(qm_diff_regs)); ++ qm->debug.qm_diff_regs = NULL; + } + + /** +-- +2.43.0 + diff --git a/queue-6.1/drm-amd-display-check-index-msg_id-before-read-or-wr.patch b/queue-6.1/drm-amd-display-check-index-msg_id-before-read-or-wr.patch new file mode 100644 index 00000000000..1d9ff63fdb6 --- /dev/null +++ b/queue-6.1/drm-amd-display-check-index-msg_id-before-read-or-wr.patch @@ -0,0 +1,56 @@ +From 604cc54f3b2baa6c01c0e6fa2a2a0c9aa94008bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Apr 2024 13:27:43 -0600 +Subject: drm/amd/display: Check index msg_id before read or write + +From: Alex Hung + +[ Upstream commit 59d99deb330af206a4541db0c4da8f73880fba03 ] + +[WHAT] +msg_id is used as an array index and it cannot be a negative value, and +therefore cannot be equal to MOD_HDCP_MESSAGE_ID_INVALID (-1). + +[HOW] +Check whether msg_id is valid before reading and setting. + +This fixes 4 OVERRUN issues reported by Coverity. + +Reviewed-by: Rodrigo Siqueira +Acked-by: Wayne Lin +Signed-off-by: Alex Hung +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c +index f7b5583ee609a..8e9caae7c9559 100644 +--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c ++++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c +@@ -156,6 +156,10 @@ static enum mod_hdcp_status read(struct mod_hdcp *hdcp, + uint32_t cur_size = 0; + uint32_t data_offset = 0; + ++ if (msg_id == MOD_HDCP_MESSAGE_ID_INVALID) { ++ return MOD_HDCP_STATUS_DDC_FAILURE; ++ } ++ + if (is_dp_hdcp(hdcp)) { + while (buf_len > 0) { + cur_size = MIN(buf_len, HDCP_MAX_AUX_TRANSACTION_SIZE); +@@ -215,6 +219,10 @@ static enum mod_hdcp_status write(struct mod_hdcp *hdcp, + uint32_t cur_size = 0; + uint32_t data_offset = 0; + ++ if (msg_id == MOD_HDCP_MESSAGE_ID_INVALID) { ++ return MOD_HDCP_STATUS_DDC_FAILURE; ++ } ++ + if (is_dp_hdcp(hdcp)) { + while (buf_len > 0) { + cur_size = MIN(buf_len, HDCP_MAX_AUX_TRANSACTION_SIZE); +-- +2.43.0 + diff --git a/queue-6.1/drm-amd-display-check-pipe-offset-before-setting-vbl.patch b/queue-6.1/drm-amd-display-check-pipe-offset-before-setting-vbl.patch new file mode 100644 index 00000000000..d1970341ff8 --- /dev/null +++ b/queue-6.1/drm-amd-display-check-pipe-offset-before-setting-vbl.patch @@ -0,0 +1,45 @@ +From cad3a80dd91c5174c860bcaee48ec9389662984d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Apr 2024 18:07:17 -0600 +Subject: drm/amd/display: Check pipe offset before setting vblank + +From: Alex Hung + +[ Upstream commit 5396a70e8cf462ec5ccf2dc8de103c79de9489e6 ] + +pipe_ctx has a size of MAX_PIPES so checking its index before accessing +the array. + +This fixes an OVERRUN issue reported by Coverity. + +Reviewed-by: Rodrigo Siqueira +Acked-by: Wayne Lin +Signed-off-by: Alex Hung +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + .../drm/amd/display/dc/irq/dce110/irq_service_dce110.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +index 44649db5f3e32..5646b7788f02e 100644 +--- a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c ++++ b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +@@ -211,8 +211,12 @@ bool dce110_vblank_set(struct irq_service *irq_service, + info->ext_id); + uint8_t pipe_offset = dal_irq_src - IRQ_TYPE_VBLANK; + +- struct timing_generator *tg = +- dc->current_state->res_ctx.pipe_ctx[pipe_offset].stream_res.tg; ++ struct timing_generator *tg; ++ ++ if (pipe_offset >= MAX_PIPES) ++ return false; ++ ++ tg = dc->current_state->res_ctx.pipe_ctx[pipe_offset].stream_res.tg; + + if (enable) { + if (!tg || !tg->funcs->arm_vert_intr(tg, 2)) { +-- +2.43.0 + diff --git a/queue-6.1/drm-amd-display-skip-finding-free-audio-for-unknown-.patch b/queue-6.1/drm-amd-display-skip-finding-free-audio-for-unknown-.patch new file mode 100644 index 00000000000..2fcf4bb25db --- /dev/null +++ b/queue-6.1/drm-amd-display-skip-finding-free-audio-for-unknown-.patch @@ -0,0 +1,44 @@ +From 01eccdfcbbc042127c3fbdf250966b8a486acbdc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Apr 2024 13:52:27 -0600 +Subject: drm/amd/display: Skip finding free audio for unknown engine_id + +From: Alex Hung + +[ Upstream commit 1357b2165d9ad94faa4c4a20d5e2ce29c2ff29c3 ] + +[WHY] +ENGINE_ID_UNKNOWN = -1 and can not be used as an array index. Plus, it +also means it is uninitialized and does not need free audio. + +[HOW] +Skip and return NULL. + +This fixes 2 OVERRUN issues reported by Coverity. + +Reviewed-by: Rodrigo Siqueira +Acked-by: Wayne Lin +Signed-off-by: Alex Hung +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +index e2f80cd0ca8cb..83898e46bcadf 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -2146,6 +2146,9 @@ static struct audio *find_first_free_audio( + { + int i, available_audio_count; + ++ if (id == ENGINE_ID_UNKNOWN) ++ return NULL; ++ + available_audio_count = pool->audio_count; + + for (i = 0; i < available_audio_count; i++) { +-- +2.43.0 + diff --git a/queue-6.1/drm-amdgpu-fix-the-warning-about-the-expression-int-.patch b/queue-6.1/drm-amdgpu-fix-the-warning-about-the-expression-int-.patch new file mode 100644 index 00000000000..0b0dcd5aa82 --- /dev/null +++ b/queue-6.1/drm-amdgpu-fix-the-warning-about-the-expression-int-.patch @@ -0,0 +1,43 @@ +From dc2ab8a3c4a6962b3314cadce7cf5fac379d1096 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Apr 2024 15:16:40 +0800 +Subject: drm/amdgpu: fix the warning about the expression (int)size - len + +From: Jesse Zhang + +[ Upstream commit ea686fef5489ef7a2450a9fdbcc732b837fb46a8 ] + +Converting size from size_t to int may overflow. +v2: keep reverse xmas tree order (Christian) + +Signed-off-by: Jesse Zhang +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +index 06ab6066da61a..20045d7cd9316 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +@@ -1886,12 +1886,13 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, + struct amdgpu_device *adev = (struct amdgpu_device *)file_inode(f)->i_private; + char reg_offset[11]; + uint32_t *new = NULL, *tmp = NULL; +- int ret, i = 0, len = 0; ++ unsigned int len = 0; ++ int ret, i = 0; + + do { + memset(reg_offset, 0, 11); + if (copy_from_user(reg_offset, buf + len, +- min(10, ((int)size-len)))) { ++ min(10, (size-len)))) { + ret = -EFAULT; + goto error_free; + } +-- +2.43.0 + diff --git a/queue-6.1/drm-amdgpu-fix-uninitialized-scalar-variable-warning.patch b/queue-6.1/drm-amdgpu-fix-uninitialized-scalar-variable-warning.patch new file mode 100644 index 00000000000..9c366f1dd76 --- /dev/null +++ b/queue-6.1/drm-amdgpu-fix-uninitialized-scalar-variable-warning.patch @@ -0,0 +1,39 @@ +From 523592105991195e2951a9857a08e8a7672113ed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Apr 2024 14:06:28 +0800 +Subject: drm/amdgpu: fix uninitialized scalar variable warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Tim Huang + +[ Upstream commit 9a5f15d2a29d06ce5bd50919da7221cda92afb69 ] + +Clear warning that uses uninitialized value fw_size. + +Signed-off-by: Tim Huang +Reviewed-by: Christian König +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +index b803e785d3aff..e9e0e7328c4e1 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +@@ -1004,7 +1004,8 @@ void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev, + fw_size = le32_to_cpu(cp_hdr_v2_0->data_size_bytes); + break; + default: +- break; ++ dev_err(adev->dev, "Invalid ucode id %u\n", ucode_id); ++ return; + } + + if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) { +-- +2.43.0 + diff --git a/queue-6.1/drm-amdgpu-fix-uninitialized-variable-warnings.patch b/queue-6.1/drm-amdgpu-fix-uninitialized-variable-warnings.patch new file mode 100644 index 00000000000..0ea3a02e8f2 --- /dev/null +++ b/queue-6.1/drm-amdgpu-fix-uninitialized-variable-warnings.patch @@ -0,0 +1,52 @@ +From 7983ba64a78f90e88b0d83b826b54189710e4940 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Apr 2024 14:47:52 +0800 +Subject: drm/amdgpu: Fix uninitialized variable warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ma Jun + +[ Upstream commit 60c448439f3b5db9431e13f7f361b4074d0e8594 ] + +return 0 to avoid returning an uninitialized variable r + +Signed-off-by: Ma Jun +Acked-by: Christian König +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c b/drivers/gpu/drm/amd/amdgpu/aldebaran.c +index fa6193535d485..7fea4f0f495a3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c ++++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c +@@ -100,7 +100,7 @@ static int aldebaran_mode2_suspend_ip(struct amdgpu_device *adev) + adev->ip_blocks[i].status.hw = false; + } + +- return r; ++ return 0; + } + + static int +diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c +index 81a6d5b94987f..1311e72486fdc 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c ++++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c +@@ -93,7 +93,7 @@ static int sienna_cichlid_mode2_suspend_ip(struct amdgpu_device *adev) + adev->ip_blocks[i].status.hw = false; + } + +- return r; ++ return 0; + } + + static int +-- +2.43.0 + diff --git a/queue-6.1/drm-amdgpu-initialize-timestamp-for-some-legacy-socs.patch b/queue-6.1/drm-amdgpu-initialize-timestamp-for-some-legacy-socs.patch new file mode 100644 index 00000000000..aa8bb3b47e3 --- /dev/null +++ b/queue-6.1/drm-amdgpu-initialize-timestamp-for-some-legacy-socs.patch @@ -0,0 +1,46 @@ +From dc67de6a7df66fa16f2f7468ee95dbeaeff1a2da Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Apr 2024 10:07:51 +0800 +Subject: drm/amdgpu: Initialize timestamp for some legacy SOCs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ma Jun + +[ Upstream commit 2e55bcf3d742a4946d862b86e39e75a95cc6f1c0 ] + +Initialize the interrupt timestamp for some legacy SOCs +to fix the coverity issue "Uninitialized scalar variable" + +Signed-off-by: Ma Jun +Suggested-by: Christian König +Reviewed-by: Christian König +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +index 9efbc0f7c6bdf..c3da333f09de4 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +@@ -480,6 +480,14 @@ void amdgpu_irq_dispatch(struct amdgpu_device *adev, + + entry.ih = ih; + entry.iv_entry = (const uint32_t *)&ih->ring[ring_index]; ++ ++ /* ++ * timestamp is not supported on some legacy SOCs (cik, cz, iceland, ++ * si and tonga), so initialize timestamp and timestamp_src to 0 ++ */ ++ entry.timestamp = 0; ++ entry.timestamp_src = 0; ++ + amdgpu_ih_decode_iv(adev, &entry); + + trace_amdgpu_iv(ih - &adev->irq.ih, &entry); +-- +2.43.0 + diff --git a/queue-6.1/drm-i915-fix-gt-reset-with-guc-submission-is-disable.patch b/queue-6.1/drm-i915-fix-gt-reset-with-guc-submission-is-disable.patch new file mode 100644 index 00000000000..feb7a507770 --- /dev/null +++ b/queue-6.1/drm-i915-fix-gt-reset-with-guc-submission-is-disable.patch @@ -0,0 +1,72 @@ +From 24ed35e115f93f278b47bf679d82ed5e30b03ac1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 22 Apr 2024 22:19:51 +0200 +Subject: drm/i915: Fix gt reset with GuC submission is disabled + +From: Nirmoy Das + +[ Upstream commit 4d3421e04c5dc38baf15224c051256204f223c15 ] + +Currently intel_gt_reset() kills the GuC and then resets requested +engines. This is problematic because there is a dedicated CSB FIFO +which only GuC can access and if that FIFO fills up, the hardware +will block on the next context switch until there is space that means +the system is effectively hung. If an engine is reset whilst actively +executing a context, a CSB entry will be sent to say that the context +has gone idle. Thus if reset happens on a very busy system then +killing GuC before killing the engines will lead to deadlock because +of filled up CSB FIFO. + +To address this issue, the GuC should be killed only after resetting +the requested engines and before calling intel_gt_init_hw(). + +v2: Improve commit message(John) + +Cc: John Harrison +Signed-off-by: Nirmoy Das +Reviewed-by: John Harrison +Reviewed-by: Andi Shyti +Signed-off-by: Andi Shyti +Link: https://patchwork.freedesktop.org/patch/msgid/20240422201951.633-2-nirmoy.das@intel.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/i915/gt/intel_reset.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c +index 10b930eaa8cb8..423d0e591d1fc 100644 +--- a/drivers/gpu/drm/i915/gt/intel_reset.c ++++ b/drivers/gpu/drm/i915/gt/intel_reset.c +@@ -813,8 +813,17 @@ static intel_engine_mask_t reset_prepare(struct intel_gt *gt) + intel_engine_mask_t awake = 0; + enum intel_engine_id id; + +- /* For GuC mode, ensure submission is disabled before stopping ring */ +- intel_uc_reset_prepare(>->uc); ++ /** ++ * For GuC mode with submission enabled, ensure submission ++ * is disabled before stopping ring. ++ * ++ * For GuC mode with submission disabled, ensure that GuC is not ++ * sanitized, do that after engine reset. reset_prepare() ++ * is followed by engine reset which in this mode requires GuC to ++ * process any CSB FIFO entries generated by the resets. ++ */ ++ if (intel_uc_uses_guc_submission(>->uc)) ++ intel_uc_reset_prepare(>->uc); + + for_each_engine(engine, gt, id) { + if (intel_engine_pm_get_if_awake(engine)) +@@ -1161,6 +1170,9 @@ void intel_gt_reset(struct intel_gt *gt, + + intel_overlay_reset(gt->i915); + ++ /* sanitize uC after engine reset */ ++ if (!intel_uc_uses_guc_submission(>->uc)) ++ intel_uc_reset_prepare(>->uc); + /* + * Next we need to restore the context, but we don't use those + * yet either... +-- +2.43.0 + diff --git a/queue-6.1/drm-lima-fix-shared-irq-handling-on-driver-remove.patch b/queue-6.1/drm-lima-fix-shared-irq-handling-on-driver-remove.patch new file mode 100644 index 00000000000..3dd4319fca6 --- /dev/null +++ b/queue-6.1/drm-lima-fix-shared-irq-handling-on-driver-remove.patch @@ -0,0 +1,88 @@ +From 6c2ba917be9dc24b1849af30dcc51e1bb91760c9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Apr 2024 00:43:28 +0200 +Subject: drm/lima: fix shared irq handling on driver remove + +From: Erico Nunes + +[ Upstream commit a6683c690bbfd1f371510cb051e8fa49507f3f5e ] + +lima uses a shared interrupt, so the interrupt handlers must be prepared +to be called at any time. At driver removal time, the clocks are +disabled early and the interrupts stay registered until the very end of +the remove process due to the devm usage. +This is potentially a bug as the interrupts access device registers +which assumes clocks are enabled. A crash can be triggered by removing +the driver in a kernel with CONFIG_DEBUG_SHIRQ enabled. +This patch frees the interrupts at each lima device finishing callback +so that the handlers are already unregistered by the time we fully +disable clocks. + +Signed-off-by: Erico Nunes +Signed-off-by: Qiang Yu +Link: https://patchwork.freedesktop.org/patch/msgid/20240401224329.1228468-2-nunes.erico@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/lima/lima_gp.c | 2 ++ + drivers/gpu/drm/lima/lima_mmu.c | 5 +++++ + drivers/gpu/drm/lima/lima_pp.c | 4 ++++ + 3 files changed, 11 insertions(+) + +diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c +index 6cf46b653e810..ca3842f719842 100644 +--- a/drivers/gpu/drm/lima/lima_gp.c ++++ b/drivers/gpu/drm/lima/lima_gp.c +@@ -324,7 +324,9 @@ int lima_gp_init(struct lima_ip *ip) + + void lima_gp_fini(struct lima_ip *ip) + { ++ struct lima_device *dev = ip->dev; + ++ devm_free_irq(dev->dev, ip->irq, ip); + } + + int lima_gp_pipe_init(struct lima_device *dev) +diff --git a/drivers/gpu/drm/lima/lima_mmu.c b/drivers/gpu/drm/lima/lima_mmu.c +index a1ae6c252dc2b..8ca7047adbaca 100644 +--- a/drivers/gpu/drm/lima/lima_mmu.c ++++ b/drivers/gpu/drm/lima/lima_mmu.c +@@ -118,7 +118,12 @@ int lima_mmu_init(struct lima_ip *ip) + + void lima_mmu_fini(struct lima_ip *ip) + { ++ struct lima_device *dev = ip->dev; ++ ++ if (ip->id == lima_ip_ppmmu_bcast) ++ return; + ++ devm_free_irq(dev->dev, ip->irq, ip); + } + + void lima_mmu_flush_tlb(struct lima_ip *ip) +diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c +index 54b208a4a768e..d34c9e8840f45 100644 +--- a/drivers/gpu/drm/lima/lima_pp.c ++++ b/drivers/gpu/drm/lima/lima_pp.c +@@ -266,7 +266,9 @@ int lima_pp_init(struct lima_ip *ip) + + void lima_pp_fini(struct lima_ip *ip) + { ++ struct lima_device *dev = ip->dev; + ++ devm_free_irq(dev->dev, ip->irq, ip); + } + + int lima_pp_bcast_resume(struct lima_ip *ip) +@@ -299,7 +301,9 @@ int lima_pp_bcast_init(struct lima_ip *ip) + + void lima_pp_bcast_fini(struct lima_ip *ip) + { ++ struct lima_device *dev = ip->dev; + ++ devm_free_irq(dev->dev, ip->irq, ip); + } + + static int lima_pp_task_validate(struct lima_sched_pipe *pipe, +-- +2.43.0 + diff --git a/queue-6.1/f2fs-check-validation-of-fault-attrs-in-f2fs_build_f.patch b/queue-6.1/f2fs-check-validation-of-fault-attrs-in-f2fs_build_f.patch new file mode 100644 index 00000000000..89d9de77452 --- /dev/null +++ b/queue-6.1/f2fs-check-validation-of-fault-attrs-in-f2fs_build_f.patch @@ -0,0 +1,142 @@ +From 952692f90be19a026257fa8d3c8bf6ad94e9d515 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 11:38:47 +0800 +Subject: f2fs: check validation of fault attrs in f2fs_build_fault_attr() + +From: Chao Yu + +[ Upstream commit 4ed886b187f47447ad559619c48c086f432d2b77 ] + +- It missed to check validation of fault attrs in parse_options(), +let's fix to add check condition in f2fs_build_fault_attr(). +- Use f2fs_build_fault_attr() in __sbi_store() to clean up code. + +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/f2fs.h | 12 ++++++++---- + fs/f2fs/super.c | 27 ++++++++++++++++++++------- + fs/f2fs/sysfs.c | 14 ++++++++++---- + 3 files changed, 38 insertions(+), 15 deletions(-) + +diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h +index b54d681c6457d..a1dc08f007dbe 100644 +--- a/fs/f2fs/f2fs.h ++++ b/fs/f2fs/f2fs.h +@@ -68,7 +68,7 @@ enum { + + struct f2fs_fault_info { + atomic_t inject_ops; +- unsigned int inject_rate; ++ int inject_rate; + unsigned int inject_type; + }; + +@@ -4530,10 +4530,14 @@ static inline bool f2fs_need_verity(const struct inode *inode, pgoff_t idx) + } + + #ifdef CONFIG_F2FS_FAULT_INJECTION +-extern void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate, +- unsigned int type); ++extern int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate, ++ unsigned long type); + #else +-#define f2fs_build_fault_attr(sbi, rate, type) do { } while (0) ++static int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate, ++ unsigned long type) ++{ ++ return 0; ++} + #endif + + static inline bool is_journalled_quota(struct f2fs_sb_info *sbi) +diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c +index f496622921843..6bd8c231069ad 100644 +--- a/fs/f2fs/super.c ++++ b/fs/f2fs/super.c +@@ -63,21 +63,31 @@ const char *f2fs_fault_name[FAULT_MAX] = { + [FAULT_LOCK_OP] = "lock_op", + }; + +-void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate, +- unsigned int type) ++int f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned long rate, ++ unsigned long type) + { + struct f2fs_fault_info *ffi = &F2FS_OPTION(sbi).fault_info; + + if (rate) { ++ if (rate > INT_MAX) ++ return -EINVAL; + atomic_set(&ffi->inject_ops, 0); +- ffi->inject_rate = rate; ++ ffi->inject_rate = (int)rate; + } + +- if (type) +- ffi->inject_type = type; ++ if (type) { ++ if (type >= BIT(FAULT_MAX)) ++ return -EINVAL; ++ ffi->inject_type = (unsigned int)type; ++ } + + if (!rate && !type) + memset(ffi, 0, sizeof(struct f2fs_fault_info)); ++ else ++ f2fs_info(sbi, ++ "build fault injection attr: rate: %lu, type: 0x%lx", ++ rate, type); ++ return 0; + } + #endif + +@@ -916,14 +926,17 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) + case Opt_fault_injection: + if (args->from && match_int(args, &arg)) + return -EINVAL; +- f2fs_build_fault_attr(sbi, arg, F2FS_ALL_FAULT_TYPE); ++ if (f2fs_build_fault_attr(sbi, arg, ++ F2FS_ALL_FAULT_TYPE)) ++ return -EINVAL; + set_opt(sbi, FAULT_INJECTION); + break; + + case Opt_fault_type: + if (args->from && match_int(args, &arg)) + return -EINVAL; +- f2fs_build_fault_attr(sbi, 0, arg); ++ if (f2fs_build_fault_attr(sbi, 0, arg)) ++ return -EINVAL; + set_opt(sbi, FAULT_INJECTION); + break; + #else +diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c +index 751a108e612ff..06d5791afe90e 100644 +--- a/fs/f2fs/sysfs.c ++++ b/fs/f2fs/sysfs.c +@@ -451,10 +451,16 @@ static ssize_t __sbi_store(struct f2fs_attr *a, + if (ret < 0) + return ret; + #ifdef CONFIG_F2FS_FAULT_INJECTION +- if (a->struct_type == FAULT_INFO_TYPE && t >= BIT(FAULT_MAX)) +- return -EINVAL; +- if (a->struct_type == FAULT_INFO_RATE && t >= UINT_MAX) +- return -EINVAL; ++ if (a->struct_type == FAULT_INFO_TYPE) { ++ if (f2fs_build_fault_attr(sbi, 0, t)) ++ return -EINVAL; ++ return count; ++ } ++ if (a->struct_type == FAULT_INFO_RATE) { ++ if (f2fs_build_fault_attr(sbi, t, 0)) ++ return -EINVAL; ++ return count; ++ } + #endif + if (a->struct_type == RESERVED_BLOCKS) { + spin_lock(&sbi->stat_lock); +-- +2.43.0 + diff --git a/queue-6.1/firmware-dmi-stop-decoding-on-broken-entry.patch b/queue-6.1/firmware-dmi-stop-decoding-on-broken-entry.patch new file mode 100644 index 00000000000..03a3632109b --- /dev/null +++ b/queue-6.1/firmware-dmi-stop-decoding-on-broken-entry.patch @@ -0,0 +1,46 @@ +From 01564dbaaaabc4e06b079755366a70214c96a65b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Apr 2024 18:29:32 +0200 +Subject: firmware: dmi: Stop decoding on broken entry + +From: Jean Delvare + +[ Upstream commit 0ef11f604503b1862a21597436283f158114d77e ] + +If a DMI table entry is shorter than 4 bytes, it is invalid. Due to +how DMI table parsing works, it is impossible to safely recover from +such an error, so we have to stop decoding the table. + +Signed-off-by: Jean Delvare +Link: https://lore.kernel.org/linux-kernel/Zh2K3-HLXOesT_vZ@liuwe-devbox-debian-v2/T/ +Reviewed-by: Michael Kelley +Signed-off-by: Sasha Levin +--- + drivers/firmware/dmi_scan.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c +index 015c95a825d31..ac2a5d2d47463 100644 +--- a/drivers/firmware/dmi_scan.c ++++ b/drivers/firmware/dmi_scan.c +@@ -101,6 +101,17 @@ static void dmi_decode_table(u8 *buf, + (data - buf + sizeof(struct dmi_header)) <= dmi_len) { + const struct dmi_header *dm = (const struct dmi_header *)data; + ++ /* ++ * If a short entry is found (less than 4 bytes), not only it ++ * is invalid, but we cannot reliably locate the next entry. ++ */ ++ if (dm->length < sizeof(struct dmi_header)) { ++ pr_warn(FW_BUG ++ "Corrupted DMI table, offset %zd (only %d entries processed)\n", ++ data - buf, i); ++ break; ++ } ++ + /* + * We want to know the total length (formatted area and + * strings) before decoding to make sure we won't run off the +-- +2.43.0 + diff --git a/queue-6.1/i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch b/queue-6.1/i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch new file mode 100644 index 00000000000..081976bf5b5 --- /dev/null +++ b/queue-6.1/i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch @@ -0,0 +1,35 @@ +From 922d7c6c198e4f2426bcb1a80ff913726dcf43bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Apr 2024 12:21:58 +0200 +Subject: i2c: i801: Annotate apanel_addr as __ro_after_init + +From: Heiner Kallweit + +[ Upstream commit 355b1513b1e97b6cef84b786c6480325dfd3753d ] + +Annotate this variable as __ro_after_init to protect it from being +overwritten later. + +Signed-off-by: Heiner Kallweit +Signed-off-by: Andi Shyti +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-i801.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c +index 1c970842624ba..208c7741bc681 100644 +--- a/drivers/i2c/busses/i2c-i801.c ++++ b/drivers/i2c/busses/i2c-i801.c +@@ -1057,7 +1057,7 @@ static const struct pci_device_id i801_ids[] = { + MODULE_DEVICE_TABLE(pci, i801_ids); + + #if defined CONFIG_X86 && defined CONFIG_DMI +-static unsigned char apanel_addr; ++static unsigned char apanel_addr __ro_after_init; + + /* Scan the system ROM for the signature "FJKEYINF" */ + static __init const void __iomem *bios_signature(const void __iomem *bios) +-- +2.43.0 + diff --git a/queue-6.1/ib-core-implement-a-limit-on-umad-receive-list.patch b/queue-6.1/ib-core-implement-a-limit-on-umad-receive-list.patch new file mode 100644 index 00000000000..8e98392b07c --- /dev/null +++ b/queue-6.1/ib-core-implement-a-limit-on-umad-receive-list.patch @@ -0,0 +1,125 @@ +From 85f64fbc1a9222b9ee3ddaf725a83ae4824ff3df Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Apr 2024 15:01:44 +0300 +Subject: IB/core: Implement a limit on UMAD receive List + +From: Michael Guralnik + +[ Upstream commit ca0b44e20a6f3032224599f02e7c8fb49525c894 ] + +The existing behavior of ib_umad, which maintains received MAD +packets in an unbounded list, poses a risk of uncontrolled growth. +As user-space applications extract packets from this list, the rate +of extraction may not match the rate of incoming packets, leading +to potential list overflow. + +To address this, we introduce a limit to the size of the list. After +considering typical scenarios, such as OpenSM processing, which can +handle approximately 100k packets per second, and the 1-second retry +timeout for most packets, we set the list size limit to 200k. Packets +received beyond this limit are dropped, assuming they are likely timed +out by the time they are handled by user-space. + +Notably, packets queued on the receive list due to reasons like +timed-out sends are preserved even when the list is full. + +Signed-off-by: Michael Guralnik +Reviewed-by: Mark Zhang +Link: https://lore.kernel.org/r/7197cb58a7d9e78399008f25036205ceab07fbd5.1713268818.git.leon@kernel.org +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/core/user_mad.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c +index 5c284dfbe6923..66a0c5a73b832 100644 +--- a/drivers/infiniband/core/user_mad.c ++++ b/drivers/infiniband/core/user_mad.c +@@ -63,6 +63,8 @@ MODULE_AUTHOR("Roland Dreier"); + MODULE_DESCRIPTION("InfiniBand userspace MAD packet access"); + MODULE_LICENSE("Dual BSD/GPL"); + ++#define MAX_UMAD_RECV_LIST_SIZE 200000 ++ + enum { + IB_UMAD_MAX_PORTS = RDMA_MAX_PORTS, + IB_UMAD_MAX_AGENTS = 32, +@@ -113,6 +115,7 @@ struct ib_umad_file { + struct mutex mutex; + struct ib_umad_port *port; + struct list_head recv_list; ++ atomic_t recv_list_size; + struct list_head send_list; + struct list_head port_list; + spinlock_t send_lock; +@@ -180,24 +183,28 @@ static struct ib_mad_agent *__get_agent(struct ib_umad_file *file, int id) + return file->agents_dead ? NULL : file->agent[id]; + } + +-static int queue_packet(struct ib_umad_file *file, +- struct ib_mad_agent *agent, +- struct ib_umad_packet *packet) ++static int queue_packet(struct ib_umad_file *file, struct ib_mad_agent *agent, ++ struct ib_umad_packet *packet, bool is_recv_mad) + { + int ret = 1; + + mutex_lock(&file->mutex); + ++ if (is_recv_mad && ++ atomic_read(&file->recv_list_size) > MAX_UMAD_RECV_LIST_SIZE) ++ goto unlock; ++ + for (packet->mad.hdr.id = 0; + packet->mad.hdr.id < IB_UMAD_MAX_AGENTS; + packet->mad.hdr.id++) + if (agent == __get_agent(file, packet->mad.hdr.id)) { + list_add_tail(&packet->list, &file->recv_list); ++ atomic_inc(&file->recv_list_size); + wake_up_interruptible(&file->recv_wait); + ret = 0; + break; + } +- ++unlock: + mutex_unlock(&file->mutex); + + return ret; +@@ -224,7 +231,7 @@ static void send_handler(struct ib_mad_agent *agent, + if (send_wc->status == IB_WC_RESP_TIMEOUT_ERR) { + packet->length = IB_MGMT_MAD_HDR; + packet->mad.hdr.status = ETIMEDOUT; +- if (!queue_packet(file, agent, packet)) ++ if (!queue_packet(file, agent, packet, false)) + return; + } + kfree(packet); +@@ -284,7 +291,7 @@ static void recv_handler(struct ib_mad_agent *agent, + rdma_destroy_ah_attr(&ah_attr); + } + +- if (queue_packet(file, agent, packet)) ++ if (queue_packet(file, agent, packet, true)) + goto err2; + return; + +@@ -409,6 +416,7 @@ static ssize_t ib_umad_read(struct file *filp, char __user *buf, + + packet = list_entry(file->recv_list.next, struct ib_umad_packet, list); + list_del(&packet->list); ++ atomic_dec(&file->recv_list_size); + + mutex_unlock(&file->mutex); + +@@ -421,6 +429,7 @@ static ssize_t ib_umad_read(struct file *filp, char __user *buf, + /* Requeue packet */ + mutex_lock(&file->mutex); + list_add(&packet->list, &file->recv_list); ++ atomic_inc(&file->recv_list_size); + mutex_unlock(&file->mutex); + } else { + if (packet->recv_wc) +-- +2.43.0 + diff --git a/queue-6.1/igc-fix-a-log-entry-using-uninitialized-netdev.patch b/queue-6.1/igc-fix-a-log-entry-using-uninitialized-netdev.patch new file mode 100644 index 00000000000..e7f0accdc3e --- /dev/null +++ b/queue-6.1/igc-fix-a-log-entry-using-uninitialized-netdev.patch @@ -0,0 +1,61 @@ +From 4f97864bfd222f03a26db9dcbb88fa75cfb81ea8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Apr 2024 12:24:54 +0200 +Subject: igc: fix a log entry using uninitialized netdev + +From: Corinna Vinschen + +[ Upstream commit 86167183a17e03ec77198897975e9fdfbd53cb0b ] + +During successful probe, igc logs this: + +[ 5.133667] igc 0000:01:00.0 (unnamed net_device) (uninitialized): PHC added + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +The reason is that igc_ptp_init() is called very early, even before +register_netdev() has been called. So the netdev_info() call works +on a partially uninitialized netdev. + +Fix this by calling igc_ptp_init() after register_netdev(), right +after the media autosense check, just as in igb. Add a comment, +just as in igb. + +Now the log message is fine: + +[ 5.200987] igc 0000:01:00.0 eth0: PHC added + +Signed-off-by: Corinna Vinschen +Reviewed-by: Hariprasad Kelam +Acked-by: Vinicius Costa Gomes +Tested-by: Naama Meir +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/igc/igc_main.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c +index e052f49cc08d7..d8e9eef195c84 100644 +--- a/drivers/net/ethernet/intel/igc/igc_main.c ++++ b/drivers/net/ethernet/intel/igc/igc_main.c +@@ -6679,8 +6679,6 @@ static int igc_probe(struct pci_dev *pdev, + device_set_wakeup_enable(&adapter->pdev->dev, + adapter->flags & IGC_FLAG_WOL_SUPPORTED); + +- igc_ptp_init(adapter); +- + igc_tsn_clear_schedule(adapter); + + /* reset the hardware with the new settings */ +@@ -6702,6 +6700,9 @@ static int igc_probe(struct pci_dev *pdev, + /* Check if Media Autosense is enabled */ + adapter->ei = *ei; + ++ /* do hw tstamp init after resetting */ ++ igc_ptp_init(adapter); ++ + /* print pcie link status and MAC address */ + pcie_print_link_status(pdev); + netdev_info(netdev, "MAC: %pM\n", netdev->dev_addr); +-- +2.43.0 + diff --git a/queue-6.1/input-ff-core-prefer-struct_size-over-open-coded-ari.patch b/queue-6.1/input-ff-core-prefer-struct_size-over-open-coded-ari.patch new file mode 100644 index 00000000000..e5fbd93ec5c --- /dev/null +++ b/queue-6.1/input-ff-core-prefer-struct_size-over-open-coded-ari.patch @@ -0,0 +1,73 @@ +From 46b49e4796fdc85d040bb46c58b220ec83eed2a9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 27 Apr 2024 17:05:56 +0200 +Subject: Input: ff-core - prefer struct_size over open coded arithmetic + +From: Erick Archer + +[ Upstream commit a08b8f8557ad88ffdff8905e5da972afe52e3307 ] + +This is an effort to get rid of all multiplications from allocation +functions in order to prevent integer overflows [1][2]. + +As the "ff" variable is a pointer to "struct ff_device" and this +structure ends in a flexible array: + +struct ff_device { + [...] + struct file *effect_owners[] __counted_by(max_effects); +}; + +the preferred way in the kernel is to use the struct_size() helper to +do the arithmetic instead of the calculation "size + count * size" in +the kzalloc() function. + +The struct_size() helper returns SIZE_MAX on overflow. So, refactor +the comparison to take advantage of this. + +This way, the code is more readable and safer. + +This code was detected with the help of Coccinelle, and audited and +modified manually. + +Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments [1] +Link: https://github.com/KSPP/linux/issues/160 [2] +Signed-off-by: Erick Archer +Reviewed-by: Kees Cook +Link: https://lore.kernel.org/r/AS8PR02MB72371E646714BAE2E51A6A378B152@AS8PR02MB7237.eurprd02.prod.outlook.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/ff-core.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c +index 16231fe080b00..609a5f01761bd 100644 +--- a/drivers/input/ff-core.c ++++ b/drivers/input/ff-core.c +@@ -9,8 +9,10 @@ + /* #define DEBUG */ + + #include ++#include + #include + #include ++#include + #include + #include + +@@ -315,9 +317,8 @@ int input_ff_create(struct input_dev *dev, unsigned int max_effects) + return -EINVAL; + } + +- ff_dev_size = sizeof(struct ff_device) + +- max_effects * sizeof(struct file *); +- if (ff_dev_size < max_effects) /* overflow */ ++ ff_dev_size = struct_size(ff, effect_owners, max_effects); ++ if (ff_dev_size == SIZE_MAX) /* overflow */ + return -EINVAL; + + ff = kzalloc(ff_dev_size, GFP_KERNEL); +-- +2.43.0 + diff --git a/queue-6.1/irqchip-gic-v3-its-remove-bug_on-in-its_vpe_irq_doma.patch b/queue-6.1/irqchip-gic-v3-its-remove-bug_on-in-its_vpe_irq_doma.patch new file mode 100644 index 00000000000..d82c79017b2 --- /dev/null +++ b/queue-6.1/irqchip-gic-v3-its-remove-bug_on-in-its_vpe_irq_doma.patch @@ -0,0 +1,41 @@ +From 13e8cf48ed99b9dd82564f783f6dc3cf74cd6d2c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Apr 2024 14:10:53 +0800 +Subject: irqchip/gic-v3-its: Remove BUG_ON in its_vpe_irq_domain_alloc + +From: Guanrui Huang + +[ Upstream commit 382d2ffe86efb1e2fa803d2cf17e5bfc34e574f3 ] + +This BUG_ON() is useless, because the same effect will be obtained +by letting the code run its course and vm being dereferenced, +triggering an exception. + +So just remove this check. + +Signed-off-by: Guanrui Huang +Signed-off-by: Thomas Gleixner +Reviewed-by: Zenghui Yu +Acked-by: Marc Zyngier +Link: https://lore.kernel.org/r/20240418061053.96803-3-guanrui.huang@linux.alibaba.com +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-gic-v3-its.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c +index 3620bdb5200f2..a7a952bbfdc28 100644 +--- a/drivers/irqchip/irq-gic-v3-its.c ++++ b/drivers/irqchip/irq-gic-v3-its.c +@@ -4476,8 +4476,6 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq + struct page *vprop_page; + int base, nr_ids, i, err = 0; + +- BUG_ON(!vm); +- + bitmap = its_lpi_alloc(roundup_pow_of_two(nr_irqs), &base, &nr_ids); + if (!bitmap) + return -ENOMEM; +-- +2.43.0 + diff --git a/queue-6.1/jffs2-fix-potential-illegal-address-access-in-jffs2_.patch b/queue-6.1/jffs2-fix-potential-illegal-address-access-in-jffs2_.patch new file mode 100644 index 00000000000..468215334a2 --- /dev/null +++ b/queue-6.1/jffs2-fix-potential-illegal-address-access-in-jffs2_.patch @@ -0,0 +1,94 @@ +From edb2d201896f8112e0885e1f914864151db60df6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 15:00:46 +0800 +Subject: jffs2: Fix potential illegal address access in jffs2_free_inode + +From: Wang Yong + +[ Upstream commit af9a8730ddb6a4b2edd779ccc0aceb994d616830 ] + +During the stress testing of the jffs2 file system,the following +abnormal printouts were found: +[ 2430.649000] Unable to handle kernel paging request at virtual address 0069696969696948 +[ 2430.649622] Mem abort info: +[ 2430.649829] ESR = 0x96000004 +[ 2430.650115] EC = 0x25: DABT (current EL), IL = 32 bits +[ 2430.650564] SET = 0, FnV = 0 +[ 2430.650795] EA = 0, S1PTW = 0 +[ 2430.651032] FSC = 0x04: level 0 translation fault +[ 2430.651446] Data abort info: +[ 2430.651683] ISV = 0, ISS = 0x00000004 +[ 2430.652001] CM = 0, WnR = 0 +[ 2430.652558] [0069696969696948] address between user and kernel address ranges +[ 2430.653265] Internal error: Oops: 96000004 [#1] PREEMPT SMP +[ 2430.654512] CPU: 2 PID: 20919 Comm: cat Not tainted 5.15.25-g512f31242bf6 #33 +[ 2430.655008] Hardware name: linux,dummy-virt (DT) +[ 2430.655517] pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +[ 2430.656142] pc : kfree+0x78/0x348 +[ 2430.656630] lr : jffs2_free_inode+0x24/0x48 +[ 2430.657051] sp : ffff800009eebd10 +[ 2430.657355] x29: ffff800009eebd10 x28: 0000000000000001 x27: 0000000000000000 +[ 2430.658327] x26: ffff000038f09d80 x25: 0080000000000000 x24: ffff800009d38000 +[ 2430.658919] x23: 5a5a5a5a5a5a5a5a x22: ffff000038f09d80 x21: ffff8000084f0d14 +[ 2430.659434] x20: ffff0000bf9a6ac0 x19: 0169696969696940 x18: 0000000000000000 +[ 2430.659969] x17: ffff8000b6506000 x16: ffff800009eec000 x15: 0000000000004000 +[ 2430.660637] x14: 0000000000000000 x13: 00000001000820a1 x12: 00000000000d1b19 +[ 2430.661345] x11: 0004000800000000 x10: 0000000000000001 x9 : ffff8000084f0d14 +[ 2430.662025] x8 : ffff0000bf9a6b40 x7 : ffff0000bf9a6b48 x6 : 0000000003470302 +[ 2430.662695] x5 : ffff00002e41dcc0 x4 : ffff0000bf9aa3b0 x3 : 0000000003470342 +[ 2430.663486] x2 : 0000000000000000 x1 : ffff8000084f0d14 x0 : fffffc0000000000 +[ 2430.664217] Call trace: +[ 2430.664528] kfree+0x78/0x348 +[ 2430.664855] jffs2_free_inode+0x24/0x48 +[ 2430.665233] i_callback+0x24/0x50 +[ 2430.665528] rcu_do_batch+0x1ac/0x448 +[ 2430.665892] rcu_core+0x28c/0x3c8 +[ 2430.666151] rcu_core_si+0x18/0x28 +[ 2430.666473] __do_softirq+0x138/0x3cc +[ 2430.666781] irq_exit+0xf0/0x110 +[ 2430.667065] handle_domain_irq+0x6c/0x98 +[ 2430.667447] gic_handle_irq+0xac/0xe8 +[ 2430.667739] call_on_irq_stack+0x28/0x54 +The parameter passed to kfree was 5a5a5a5a, which corresponds to the target field of +the jffs_inode_info structure. It was found that all variables in the jffs_inode_info +structure were 5a5a5a5a, except for the first member sem. It is suspected that these +variables are not initialized because they were set to 5a5a5a5a during memory testing, +which is meant to detect uninitialized memory.The sem variable is initialized in the +function jffs2_i_init_once, while other members are initialized in +the function jffs2_init_inode_info. + +The function jffs2_init_inode_info is called after iget_locked, +but in the iget_locked function, the destroy_inode process is triggered, +which releases the inode and consequently, the target member of the inode +is not initialized.In concurrent high pressure scenarios, iget_locked +may enter the destroy_inode branch as described in the code. + +Since the destroy_inode functionality of jffs2 only releases the target, +the fix method is to set target to NULL in jffs2_i_init_once. + +Signed-off-by: Wang Yong +Reviewed-by: Lu Zhongjun +Reviewed-by: Yang Tao +Cc: Xu Xin +Cc: Yang Yang +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + fs/jffs2/super.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c +index 7ea37f49f1e18..e71f4c94c4483 100644 +--- a/fs/jffs2/super.c ++++ b/fs/jffs2/super.c +@@ -58,6 +58,7 @@ static void jffs2_i_init_once(void *foo) + struct jffs2_inode_info *f = foo; + + mutex_init(&f->sem); ++ f->target = NULL; + inode_init_once(&f->vfs_inode); + } + +-- +2.43.0 + diff --git a/queue-6.1/kunit-fix-timeout-message.patch b/queue-6.1/kunit-fix-timeout-message.patch new file mode 100644 index 00000000000..d99445fe6fb --- /dev/null +++ b/queue-6.1/kunit-fix-timeout-message.patch @@ -0,0 +1,52 @@ +From ab1b506f36305a2f64f8b70bf8f412cf6d834d9d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Apr 2024 09:46:21 +0200 +Subject: kunit: Fix timeout message +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mickaël Salaün + +[ Upstream commit 53026ff63bb07c04a0e962a74723eb10ff6f9dc7 ] + +The exit code is always checked, so let's properly handle the -ETIMEDOUT +error code. + +Cc: Brendan Higgins +Cc: Shuah Khan +Reviewed-by: Kees Cook +Reviewed-by: David Gow +Reviewed-by: Rae Moar +Signed-off-by: Mickaël Salaün +Link: https://lore.kernel.org/r/20240408074625.65017-4-mic@digikod.net +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + lib/kunit/try-catch.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c +index d9d1df28cc52e..9c9e4dcf06d96 100644 +--- a/lib/kunit/try-catch.c ++++ b/lib/kunit/try-catch.c +@@ -78,7 +78,6 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) + time_remaining = wait_for_completion_timeout(&try_completion, + kunit_test_timeout()); + if (time_remaining == 0) { +- kunit_err(test, "try timed out\n"); + try_catch->try_result = -ETIMEDOUT; + kthread_stop(task_struct); + } +@@ -93,6 +92,8 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) + try_catch->try_result = 0; + else if (exit_code == -EINTR) + kunit_err(test, "wake_up_process() was never called\n"); ++ else if (exit_code == -ETIMEDOUT) ++ kunit_err(test, "try timed out\n"); + else if (exit_code) + kunit_err(test, "Unknown error: %d\n", exit_code); + +-- +2.43.0 + diff --git a/queue-6.1/kunit-handle-test-faults.patch b/queue-6.1/kunit-handle-test-faults.patch new file mode 100644 index 00000000000..b01ef983e5d --- /dev/null +++ b/queue-6.1/kunit-handle-test-faults.patch @@ -0,0 +1,152 @@ +From 3e3848717f0409a23a3b4e57a2bc0a1ddef62860 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Apr 2024 09:46:22 +0200 +Subject: kunit: Handle test faults +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mickaël Salaün + +[ Upstream commit 3a35c13007dea132a65f07de05c26b87837fadc2 ] + +Previously, when a kernel test thread crashed (e.g. NULL pointer +dereference, general protection fault), the KUnit test hanged for 30 +seconds and exited with a timeout error. + +Fix this issue by waiting on task_struct->vfork_done instead of the +custom kunit_try_catch.try_completion, and track the execution state by +initially setting try_result with -EINTR and only setting it to 0 if +the test passed. + +Fix kunit_generic_run_threadfn_adapter() signature by returning 0 +instead of calling kthread_complete_and_exit(). Because thread's exit +code is never checked, always set it to 0 to make it clear. To make +this explicit, export kthread_exit() for KUnit tests built as module. + +Fix the -EINTR error message, which couldn't be reached until now. + +This is tested with a following patch. + +Cc: Brendan Higgins +Cc: Eric W. Biederman +Cc: Shuah Khan +Reviewed-by: Kees Cook +Reviewed-by: David Gow +Tested-by: Rae Moar +Signed-off-by: Mickaël Salaün +Link: https://lore.kernel.org/r/20240408074625.65017-5-mic@digikod.net +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + include/kunit/try-catch.h | 3 --- + kernel/kthread.c | 1 + + lib/kunit/try-catch.c | 19 ++++++++++++------- + 3 files changed, 13 insertions(+), 10 deletions(-) + +diff --git a/include/kunit/try-catch.h b/include/kunit/try-catch.h +index c507dd43119d5..7c966a1adbd30 100644 +--- a/include/kunit/try-catch.h ++++ b/include/kunit/try-catch.h +@@ -14,13 +14,11 @@ + + typedef void (*kunit_try_catch_func_t)(void *); + +-struct completion; + struct kunit; + + /** + * struct kunit_try_catch - provides a generic way to run code which might fail. + * @test: The test case that is currently being executed. +- * @try_completion: Completion that the control thread waits on while test runs. + * @try_result: Contains any errno obtained while running test case. + * @try: The function, the test case, to attempt to run. + * @catch: The function called if @try bails out. +@@ -46,7 +44,6 @@ struct kunit; + struct kunit_try_catch { + /* private: internal use only. */ + struct kunit *test; +- struct completion *try_completion; + int try_result; + kunit_try_catch_func_t try; + kunit_try_catch_func_t catch; +diff --git a/kernel/kthread.c b/kernel/kthread.c +index f97fd01a29325..742e7c24b29f4 100644 +--- a/kernel/kthread.c ++++ b/kernel/kthread.c +@@ -305,6 +305,7 @@ void __noreturn kthread_exit(long result) + kthread->result = result; + do_exit(0); + } ++EXPORT_SYMBOL(kthread_exit); + + /** + * kthread_complete_and_exit - Exit the current kthread. +diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c +index 9c9e4dcf06d96..34d30a6f23054 100644 +--- a/lib/kunit/try-catch.c ++++ b/lib/kunit/try-catch.c +@@ -18,7 +18,7 @@ + void __noreturn kunit_try_catch_throw(struct kunit_try_catch *try_catch) + { + try_catch->try_result = -EFAULT; +- kthread_complete_and_exit(try_catch->try_completion, -EFAULT); ++ kthread_exit(0); + } + EXPORT_SYMBOL_GPL(kunit_try_catch_throw); + +@@ -26,9 +26,12 @@ static int kunit_generic_run_threadfn_adapter(void *data) + { + struct kunit_try_catch *try_catch = data; + ++ try_catch->try_result = -EINTR; + try_catch->try(try_catch->context); ++ if (try_catch->try_result == -EINTR) ++ try_catch->try_result = 0; + +- kthread_complete_and_exit(try_catch->try_completion, 0); ++ return 0; + } + + static unsigned long kunit_test_timeout(void) +@@ -58,13 +61,11 @@ static unsigned long kunit_test_timeout(void) + + void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) + { +- DECLARE_COMPLETION_ONSTACK(try_completion); + struct kunit *test = try_catch->test; + struct task_struct *task_struct; + int exit_code, time_remaining; + + try_catch->context = context; +- try_catch->try_completion = &try_completion; + try_catch->try_result = 0; + task_struct = kthread_create(kunit_generic_run_threadfn_adapter, + try_catch, "kunit_try_catch_thread"); +@@ -74,8 +75,12 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) + } + get_task_struct(task_struct); + wake_up_process(task_struct); +- +- time_remaining = wait_for_completion_timeout(&try_completion, ++ /* ++ * As for a vfork(2), task_struct->vfork_done (pointing to the ++ * underlying kthread->exited) can be used to wait for the end of a ++ * kernel thread. ++ */ ++ time_remaining = wait_for_completion_timeout(task_struct->vfork_done, + kunit_test_timeout()); + if (time_remaining == 0) { + try_catch->try_result = -ETIMEDOUT; +@@ -91,7 +96,7 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) + if (exit_code == -EFAULT) + try_catch->try_result = 0; + else if (exit_code == -EINTR) +- kunit_err(test, "wake_up_process() was never called\n"); ++ kunit_err(test, "try faulted\n"); + else if (exit_code == -ETIMEDOUT) + kunit_err(test, "try timed out\n"); + else if (exit_code) +-- +2.43.0 + diff --git a/queue-6.1/locking-mutex-introduce-devm_mutex_init.patch b/queue-6.1/locking-mutex-introduce-devm_mutex_init.patch new file mode 100644 index 00000000000..97313b948fe --- /dev/null +++ b/queue-6.1/locking-mutex-introduce-devm_mutex_init.patch @@ -0,0 +1,113 @@ +From 61cb027aa83d67f7f24bcdd0b81b678db0fc463a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Apr 2024 19:10:25 +0300 +Subject: locking/mutex: Introduce devm_mutex_init() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: George Stark + +[ Upstream commit 4cd47222e435dec8e3787614924174f53fcfb5ae ] + +Using of devm API leads to a certain order of releasing resources. +So all dependent resources which are not devm-wrapped should be deleted +with respect to devm-release order. Mutex is one of such objects that +often is bound to other resources and has no own devm wrapping. +Since mutex_destroy() actually does nothing in non-debug builds +frequently calling mutex_destroy() is just ignored which is safe for now +but wrong formally and can lead to a problem if mutex_destroy() will be +extended so introduce devm_mutex_init(). + +Suggested-by: Christophe Leroy +Signed-off-by: George Stark +Reviewed-by: Christophe Leroy +Reviewed-by: Andy Shevchenko +Reviewed-by: Marek Behún +Acked-by: Waiman Long +Link: https://lore.kernel.org/r/20240411161032.609544-2-gnstark@salutedevices.com +Signed-off-by: Lee Jones +Signed-off-by: Sasha Levin +--- + include/linux/mutex.h | 27 +++++++++++++++++++++++++++ + kernel/locking/mutex-debug.c | 12 ++++++++++++ + 2 files changed, 39 insertions(+) + +diff --git a/include/linux/mutex.h b/include/linux/mutex.h +index a33aa9eb9fc3b..5b5630e58407a 100644 +--- a/include/linux/mutex.h ++++ b/include/linux/mutex.h +@@ -21,6 +21,8 @@ + #include + #include + ++struct device; ++ + #ifdef CONFIG_DEBUG_LOCK_ALLOC + # define __DEP_MAP_MUTEX_INITIALIZER(lockname) \ + , .dep_map = { \ +@@ -171,6 +173,31 @@ do { \ + } while (0) + #endif /* CONFIG_PREEMPT_RT */ + ++#ifdef CONFIG_DEBUG_MUTEXES ++ ++int __devm_mutex_init(struct device *dev, struct mutex *lock); ++ ++#else ++ ++static inline int __devm_mutex_init(struct device *dev, struct mutex *lock) ++{ ++ /* ++ * When CONFIG_DEBUG_MUTEXES is off mutex_destroy() is just a nop so ++ * no really need to register it in the devm subsystem. ++ */ ++ return 0; ++} ++ ++#endif ++ ++#define devm_mutex_init(dev, mutex) \ ++({ \ ++ typeof(mutex) mutex_ = (mutex); \ ++ \ ++ mutex_init(mutex_); \ ++ __devm_mutex_init(dev, mutex_); \ ++}) ++ + /* + * See kernel/locking/mutex.c for detailed documentation of these APIs. + * Also see Documentation/locking/mutex-design.rst. +diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c +index bc8abb8549d20..6e6f6071cfa27 100644 +--- a/kernel/locking/mutex-debug.c ++++ b/kernel/locking/mutex-debug.c +@@ -12,6 +12,7 @@ + */ + #include + #include ++#include + #include + #include + #include +@@ -89,6 +90,17 @@ void debug_mutex_init(struct mutex *lock, const char *name, + lock->magic = lock; + } + ++static void devm_mutex_release(void *res) ++{ ++ mutex_destroy(res); ++} ++ ++int __devm_mutex_init(struct device *dev, struct mutex *lock) ++{ ++ return devm_add_action_or_reset(dev, devm_mutex_release, lock); ++} ++EXPORT_SYMBOL_GPL(__devm_mutex_init); ++ + /*** + * mutex_destroy - mark a mutex unusable + * @lock: the mutex to be destroyed +-- +2.43.0 + diff --git a/queue-6.1/media-dvb-as102-fe-fix-as10x_register_addr-packing.patch b/queue-6.1/media-dvb-as102-fe-fix-as10x_register_addr-packing.patch new file mode 100644 index 00000000000..f1b515c3586 --- /dev/null +++ b/queue-6.1/media-dvb-as102-fe-fix-as10x_register_addr-packing.patch @@ -0,0 +1,44 @@ +From 83704ac3fd956a612f902a0db0bd530a77dc54a2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Apr 2024 12:24:37 +0000 +Subject: media: dvb: as102-fe: Fix as10x_register_addr packing + +From: Ricardo Ribalda + +[ Upstream commit 309422d280748c74f57f471559980268ac27732a ] + +This structure is embedded in multiple other structures that are packed, +which conflicts with it being aligned. + +drivers/media/usb/as102/as10x_cmd.h:379:30: warning: field reg_addr within 'struct as10x_dump_memory::(unnamed at drivers/media/usb/as102/as10x_cmd.h:373:2)' is less aligned than 'struct as10x_register_addr' and is usually due to 'struct as10x_dump_memory::(unnamed at drivers/media/usb/as102/as10x_cmd.h:373:2)' being packed, which can lead to unaligned accesses [-Wunaligned-access] + +Mark it as being packed. + +Marking the inner struct as 'packed' does not change the layout, since the +whole struct is already packed, it just silences the clang warning. See +also this llvm discussion: + +https://github.com/llvm/llvm-project/issues/55520 + +Signed-off-by: Ricardo Ribalda +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-frontends/as102_fe_types.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/dvb-frontends/as102_fe_types.h b/drivers/media/dvb-frontends/as102_fe_types.h +index 297f9520ebf9d..8a4e392c88965 100644 +--- a/drivers/media/dvb-frontends/as102_fe_types.h ++++ b/drivers/media/dvb-frontends/as102_fe_types.h +@@ -174,6 +174,6 @@ struct as10x_register_addr { + uint32_t addr; + /* register mode access */ + uint8_t mode; +-}; ++} __packed; + + #endif +-- +2.43.0 + diff --git a/queue-6.1/media-dvb-frontends-tda10048-fix-integer-overflow.patch b/queue-6.1/media-dvb-frontends-tda10048-fix-integer-overflow.patch new file mode 100644 index 00000000000..9900d661a07 --- /dev/null +++ b/queue-6.1/media-dvb-frontends-tda10048-fix-integer-overflow.patch @@ -0,0 +1,53 @@ +From 031ef2eaeb9f1a0da582ceb6d937c5b8509682f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Apr 2024 16:05:04 +0100 +Subject: media: dvb-frontends: tda10048: Fix integer overflow + +From: Ricardo Ribalda + +[ Upstream commit 1aa1329a67cc214c3b7bd2a14d1301a795760b07 ] + +state->xtal_hz can be up to 16M, so it can overflow a 32 bit integer +when multiplied by pll_mfactor. + +Create a new 64 bit variable to hold the calculations. + +Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-25-3c4865f5a4b0@chromium.org +Reported-by: Dan Carpenter +Signed-off-by: Ricardo Ribalda +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-frontends/tda10048.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c +index f6d8a64762b99..907e786c5e10b 100644 +--- a/drivers/media/dvb-frontends/tda10048.c ++++ b/drivers/media/dvb-frontends/tda10048.c +@@ -410,6 +410,7 @@ static int tda10048_set_if(struct dvb_frontend *fe, u32 bw) + struct tda10048_config *config = &state->config; + int i; + u32 if_freq_khz; ++ u64 sample_freq; + + dprintk(1, "%s(bw = %d)\n", __func__, bw); + +@@ -451,9 +452,11 @@ static int tda10048_set_if(struct dvb_frontend *fe, u32 bw) + dprintk(1, "- pll_pfactor = %d\n", state->pll_pfactor); + + /* Calculate the sample frequency */ +- state->sample_freq = state->xtal_hz * (state->pll_mfactor + 45); +- state->sample_freq /= (state->pll_nfactor + 1); +- state->sample_freq /= (state->pll_pfactor + 4); ++ sample_freq = state->xtal_hz; ++ sample_freq *= state->pll_mfactor + 45; ++ do_div(sample_freq, state->pll_nfactor + 1); ++ do_div(sample_freq, state->pll_pfactor + 4); ++ state->sample_freq = sample_freq; + dprintk(1, "- sample_freq = %d\n", state->sample_freq); + + /* Update the I/F */ +-- +2.43.0 + diff --git a/queue-6.1/media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch b/queue-6.1/media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch new file mode 100644 index 00000000000..a9cad5d2aef --- /dev/null +++ b/queue-6.1/media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch @@ -0,0 +1,49 @@ +From 9748b3a27132d523d859cc8a59f1af7e3ba9c963 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Apr 2024 16:04:47 +0100 +Subject: media: dvb-frontends: tda18271c2dd: Remove casting during div + +From: Ricardo Ribalda + +[ Upstream commit e9a844632630e18ed0671a7e3467431bd719952e ] + +do_div() divides 64 bits by 32. We were adding a casting to the divider +to 64 bits, for a number that fits perfectly in 32 bits. Remove it. + +Found by cocci: +drivers/media/dvb-frontends/tda18271c2dd.c:355:1-7: WARNING: do_div() does a 64-by-32 division, please consider using div64_u64 instead. +drivers/media/dvb-frontends/tda18271c2dd.c:331:1-7: WARNING: do_div() does a 64-by-32 division, please consider using div64_u64 instead. + +Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-8-3c4865f5a4b0@chromium.org +Signed-off-by: Ricardo Ribalda +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-frontends/tda18271c2dd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/dvb-frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c +index a348344879433..fd928787207ed 100644 +--- a/drivers/media/dvb-frontends/tda18271c2dd.c ++++ b/drivers/media/dvb-frontends/tda18271c2dd.c +@@ -328,7 +328,7 @@ static int CalcMainPLL(struct tda_state *state, u32 freq) + + OscFreq = (u64) freq * (u64) Div; + OscFreq *= (u64) 16384; +- do_div(OscFreq, (u64)16000000); ++ do_div(OscFreq, 16000000); + MainDiv = OscFreq; + + state->m_Regs[MPD] = PostDiv & 0x77; +@@ -352,7 +352,7 @@ static int CalcCalPLL(struct tda_state *state, u32 freq) + OscFreq = (u64)freq * (u64)Div; + /* CalDiv = u32( OscFreq * 16384 / 16000000 ); */ + OscFreq *= (u64)16384; +- do_div(OscFreq, (u64)16000000); ++ do_div(OscFreq, 16000000); + CalDiv = OscFreq; + + state->m_Regs[CPD] = PostDiv; +-- +2.43.0 + diff --git a/queue-6.1/media-dvb-usb-dib0700_devices-add-missing-release_fi.patch b/queue-6.1/media-dvb-usb-dib0700_devices-add-missing-release_fi.patch new file mode 100644 index 00000000000..76761fa5332 --- /dev/null +++ b/queue-6.1/media-dvb-usb-dib0700_devices-add-missing-release_fi.patch @@ -0,0 +1,68 @@ +From 4957917dafd8a6c1b08af617c2a5098a89511038 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Apr 2024 21:17:56 +0000 +Subject: media: dvb-usb: dib0700_devices: Add missing release_firmware() + +From: Ricardo Ribalda + +[ Upstream commit 4b267c23ee064bd24c6933df0588ad1b6e111145 ] + +Add missing release_firmware on the error paths. + +drivers/media/usb/dvb-usb/dib0700_devices.c:2415 stk9090m_frontend_attach() warn: 'state->frontend_firmware' from request_firmware() not released on lines: 2415. +drivers/media/usb/dvb-usb/dib0700_devices.c:2497 nim9090md_frontend_attach() warn: 'state->frontend_firmware' from request_firmware() not released on lines: 2489,2497. + +Signed-off-by: Ricardo Ribalda +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/usb/dvb-usb/dib0700_devices.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c +index 7f8bebfa3e8e9..3d14aba7a0dea 100644 +--- a/drivers/media/usb/dvb-usb/dib0700_devices.c ++++ b/drivers/media/usb/dvb-usb/dib0700_devices.c +@@ -2419,7 +2419,12 @@ static int stk9090m_frontend_attach(struct dvb_usb_adapter *adap) + + adap->fe_adap[0].fe = dvb_attach(dib9000_attach, &adap->dev->i2c_adap, 0x80, &stk9090m_config); + +- return adap->fe_adap[0].fe == NULL ? -ENODEV : 0; ++ if (!adap->fe_adap[0].fe) { ++ release_firmware(state->frontend_firmware); ++ return -ENODEV; ++ } ++ ++ return 0; + } + + static int dib9090_tuner_attach(struct dvb_usb_adapter *adap) +@@ -2492,8 +2497,10 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap) + dib9000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x20, 0x80); + adap->fe_adap[0].fe = dvb_attach(dib9000_attach, &adap->dev->i2c_adap, 0x80, &nim9090md_config[0]); + +- if (adap->fe_adap[0].fe == NULL) ++ if (!adap->fe_adap[0].fe) { ++ release_firmware(state->frontend_firmware); + return -ENODEV; ++ } + + i2c = dib9000_get_i2c_master(adap->fe_adap[0].fe, DIBX000_I2C_INTERFACE_GPIO_3_4, 0); + dib9000_i2c_enumeration(i2c, 1, 0x12, 0x82); +@@ -2501,7 +2508,12 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap) + fe_slave = dvb_attach(dib9000_attach, i2c, 0x82, &nim9090md_config[1]); + dib9000_set_slave_frontend(adap->fe_adap[0].fe, fe_slave); + +- return fe_slave == NULL ? -ENODEV : 0; ++ if (!fe_slave) { ++ release_firmware(state->frontend_firmware); ++ return -ENODEV; ++ } ++ ++ return 0; + } + + static int nim9090md_tuner_attach(struct dvb_usb_adapter *adap) +-- +2.43.0 + diff --git a/queue-6.1/media-dw2102-don-t-translate-i2c-read-into-write.patch b/queue-6.1/media-dw2102-don-t-translate-i2c-read-into-write.patch new file mode 100644 index 00000000000..bd78f84f577 --- /dev/null +++ b/queue-6.1/media-dw2102-don-t-translate-i2c-read-into-write.patch @@ -0,0 +1,197 @@ +From 873ae99b8d9f83e7fceeada6d3ceee682c037a26 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 16 Jan 2022 11:22:36 +0000 +Subject: media: dw2102: Don't translate i2c read into write + +From: Michael Bunk + +[ Upstream commit 0e148a522b8453115038193e19ec7bea71403e4a ] + +The code ignored the I2C_M_RD flag on I2C messages. Instead it assumed +an i2c transaction with a single message must be a write operation and a +transaction with two messages would be a read operation. + +Though this works for the driver code, it leads to problems once the i2c +device is exposed to code not knowing this convention. For example, +I did "insmod i2c-dev" and issued read requests from userspace, which +were translated into write requests and destroyed the EEPROM of my +device. + +So, just check and respect the I2C_M_READ flag, which indicates a read +when set on a message. If it is absent, it is a write message. + +Incidentally, changing from the case statement to a while loop allows +the code to lift the limitation to two i2c messages per transaction. + +There are 4 more *_i2c_transfer functions affected by the same behaviour +and limitation that should be fixed in the same way. + +Link: https://lore.kernel.org/linux-media/20220116112238.74171-2-micha@freedict.org +Signed-off-by: Michael Bunk +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/dvb-usb/dw2102.c | 120 ++++++++++++++++++----------- + 1 file changed, 73 insertions(+), 47 deletions(-) + +diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c +index 356fc728d59a8..0da3e83389d7a 100644 +--- a/drivers/media/usb/dvb-usb/dw2102.c ++++ b/drivers/media/usb/dvb-usb/dw2102.c +@@ -716,6 +716,7 @@ static int su3000_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], + { + struct dvb_usb_device *d = i2c_get_adapdata(adap); + struct dw2102_state *state; ++ int j; + + if (!d) + return -ENODEV; +@@ -729,11 +730,11 @@ static int su3000_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], + return -EAGAIN; + } + +- switch (num) { +- case 1: +- switch (msg[0].addr) { ++ j = 0; ++ while (j < num) { ++ switch (msg[j].addr) { + case SU3000_STREAM_CTRL: +- state->data[0] = msg[0].buf[0] + 0x36; ++ state->data[0] = msg[j].buf[0] + 0x36; + state->data[1] = 3; + state->data[2] = 0; + if (dvb_usb_generic_rw(d, state->data, 3, +@@ -745,61 +746,86 @@ static int su3000_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], + if (dvb_usb_generic_rw(d, state->data, 1, + state->data, 2, 0) < 0) + err("i2c transfer failed."); +- msg[0].buf[1] = state->data[0]; +- msg[0].buf[0] = state->data[1]; ++ msg[j].buf[1] = state->data[0]; ++ msg[j].buf[0] = state->data[1]; + break; + default: +- if (3 + msg[0].len > sizeof(state->data)) { +- warn("i2c wr: len=%d is too big!\n", +- msg[0].len); ++ /* if the current write msg is followed by a another ++ * read msg to/from the same address ++ */ ++ if ((j+1 < num) && (msg[j+1].flags & I2C_M_RD) && ++ (msg[j].addr == msg[j+1].addr)) { ++ /* join both i2c msgs to one usb read command */ ++ if (4 + msg[j].len > sizeof(state->data)) { ++ warn("i2c combined wr/rd: write len=%d is too big!\n", ++ msg[j].len); ++ num = -EOPNOTSUPP; ++ break; ++ } ++ if (1 + msg[j+1].len > sizeof(state->data)) { ++ warn("i2c combined wr/rd: read len=%d is too big!\n", ++ msg[j+1].len); ++ num = -EOPNOTSUPP; ++ break; ++ } ++ ++ state->data[0] = 0x09; ++ state->data[1] = msg[j].len; ++ state->data[2] = msg[j+1].len; ++ state->data[3] = msg[j].addr; ++ memcpy(&state->data[4], msg[j].buf, msg[j].len); ++ ++ if (dvb_usb_generic_rw(d, state->data, msg[j].len + 4, ++ state->data, msg[j+1].len + 1, 0) < 0) ++ err("i2c transfer failed."); ++ ++ memcpy(msg[j+1].buf, &state->data[1], msg[j+1].len); ++ j++; ++ break; ++ } ++ ++ if (msg[j].flags & I2C_M_RD) { ++ /* single read */ ++ if (1 + msg[j].len > sizeof(state->data)) { ++ warn("i2c rd: len=%d is too big!\n", msg[j].len); ++ num = -EOPNOTSUPP; ++ break; ++ } ++ ++ state->data[0] = 0x09; ++ state->data[1] = 0; ++ state->data[2] = msg[j].len; ++ state->data[3] = msg[j].addr; ++ memcpy(&state->data[4], msg[j].buf, msg[j].len); ++ ++ if (dvb_usb_generic_rw(d, state->data, 4, ++ state->data, msg[j].len + 1, 0) < 0) ++ err("i2c transfer failed."); ++ ++ memcpy(msg[j].buf, &state->data[1], msg[j].len); ++ break; ++ } ++ ++ /* single write */ ++ if (3 + msg[j].len > sizeof(state->data)) { ++ warn("i2c wr: len=%d is too big!\n", msg[j].len); + num = -EOPNOTSUPP; + break; + } + +- /* always i2c write*/ + state->data[0] = 0x08; +- state->data[1] = msg[0].addr; +- state->data[2] = msg[0].len; ++ state->data[1] = msg[j].addr; ++ state->data[2] = msg[j].len; + +- memcpy(&state->data[3], msg[0].buf, msg[0].len); ++ memcpy(&state->data[3], msg[j].buf, msg[j].len); + +- if (dvb_usb_generic_rw(d, state->data, msg[0].len + 3, ++ if (dvb_usb_generic_rw(d, state->data, msg[j].len + 3, + state->data, 1, 0) < 0) + err("i2c transfer failed."); ++ } // switch ++ j++; + +- } +- break; +- case 2: +- /* always i2c read */ +- if (4 + msg[0].len > sizeof(state->data)) { +- warn("i2c rd: len=%d is too big!\n", +- msg[0].len); +- num = -EOPNOTSUPP; +- break; +- } +- if (1 + msg[1].len > sizeof(state->data)) { +- warn("i2c rd: len=%d is too big!\n", +- msg[1].len); +- num = -EOPNOTSUPP; +- break; +- } +- +- state->data[0] = 0x09; +- state->data[1] = msg[0].len; +- state->data[2] = msg[1].len; +- state->data[3] = msg[0].addr; +- memcpy(&state->data[4], msg[0].buf, msg[0].len); +- +- if (dvb_usb_generic_rw(d, state->data, msg[0].len + 4, +- state->data, msg[1].len + 1, 0) < 0) +- err("i2c transfer failed."); +- +- memcpy(msg[1].buf, &state->data[1], msg[1].len); +- break; +- default: +- warn("more than 2 i2c messages at a time is not handled yet."); +- break; +- } ++ } // while + mutex_unlock(&d->data_mutex); + mutex_unlock(&d->i2c_mutex); + return num; +-- +2.43.0 + diff --git a/queue-6.1/media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch b/queue-6.1/media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch new file mode 100644 index 00000000000..938b3b08efd --- /dev/null +++ b/queue-6.1/media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch @@ -0,0 +1,109 @@ +From 973d5d2a7ec54c960ef37197c9d9a41c4fec9e45 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Apr 2024 16:04:50 +0100 +Subject: media: s2255: Use refcount_t instead of atomic_t for num_channels + +From: Ricardo Ribalda + +[ Upstream commit 6cff72f6bcee89228a662435b7c47e21a391c8d0 ] + +Use an API that resembles more the actual use of num_channels. + +Found by cocci: +drivers/media/usb/s2255/s2255drv.c:2362:5-24: WARNING: atomic_dec_and_test variation before object free at line 2363. +drivers/media/usb/s2255/s2255drv.c:1557:5-24: WARNING: atomic_dec_and_test variation before object free at line 1558. + +Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-11-3c4865f5a4b0@chromium.org +Signed-off-by: Ricardo Ribalda +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/s2255/s2255drv.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c +index acf18e2251a52..6c9870541c53d 100644 +--- a/drivers/media/usb/s2255/s2255drv.c ++++ b/drivers/media/usb/s2255/s2255drv.c +@@ -247,7 +247,7 @@ struct s2255_vc { + struct s2255_dev { + struct s2255_vc vc[MAX_CHANNELS]; + struct v4l2_device v4l2_dev; +- atomic_t num_channels; ++ refcount_t num_channels; + int frames; + struct mutex lock; /* channels[].vdev.lock */ + struct mutex cmdlock; /* protects cmdbuf */ +@@ -1550,11 +1550,11 @@ static void s2255_video_device_release(struct video_device *vdev) + container_of(vdev, struct s2255_vc, vdev); + + dprintk(dev, 4, "%s, chnls: %d\n", __func__, +- atomic_read(&dev->num_channels)); ++ refcount_read(&dev->num_channels)); + + v4l2_ctrl_handler_free(&vc->hdl); + +- if (atomic_dec_and_test(&dev->num_channels)) ++ if (refcount_dec_and_test(&dev->num_channels)) + s2255_destroy(dev); + return; + } +@@ -1659,7 +1659,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev) + "failed to register video device!\n"); + break; + } +- atomic_inc(&dev->num_channels); ++ refcount_inc(&dev->num_channels); + v4l2_info(&dev->v4l2_dev, "V4L2 device registered as %s\n", + video_device_node_name(&vc->vdev)); + +@@ -1667,11 +1667,11 @@ static int s2255_probe_v4l(struct s2255_dev *dev) + pr_info("Sensoray 2255 V4L driver Revision: %s\n", + S2255_VERSION); + /* if no channels registered, return error and probe will fail*/ +- if (atomic_read(&dev->num_channels) == 0) { ++ if (refcount_read(&dev->num_channels) == 0) { + v4l2_device_unregister(&dev->v4l2_dev); + return ret; + } +- if (atomic_read(&dev->num_channels) != MAX_CHANNELS) ++ if (refcount_read(&dev->num_channels) != MAX_CHANNELS) + pr_warn("s2255: Not all channels available.\n"); + return 0; + } +@@ -2220,7 +2220,7 @@ static int s2255_probe(struct usb_interface *interface, + goto errorFWDATA1; + } + +- atomic_set(&dev->num_channels, 0); ++ refcount_set(&dev->num_channels, 0); + dev->pid = id->idProduct; + dev->fw_data = kzalloc(sizeof(struct s2255_fw), GFP_KERNEL); + if (!dev->fw_data) +@@ -2340,12 +2340,12 @@ static void s2255_disconnect(struct usb_interface *interface) + { + struct s2255_dev *dev = to_s2255_dev(usb_get_intfdata(interface)); + int i; +- int channels = atomic_read(&dev->num_channels); ++ int channels = refcount_read(&dev->num_channels); + mutex_lock(&dev->lock); + v4l2_device_disconnect(&dev->v4l2_dev); + mutex_unlock(&dev->lock); + /*see comments in the uvc_driver.c usb disconnect function */ +- atomic_inc(&dev->num_channels); ++ refcount_inc(&dev->num_channels); + /* unregister each video device. */ + for (i = 0; i < channels; i++) + video_unregister_device(&dev->vc[i].vdev); +@@ -2358,7 +2358,7 @@ static void s2255_disconnect(struct usb_interface *interface) + dev->vc[i].vidstatus_ready = 1; + wake_up(&dev->vc[i].wait_vidstatus); + } +- if (atomic_dec_and_test(&dev->num_channels)) ++ if (refcount_dec_and_test(&dev->num_channels)) + s2255_destroy(dev); + dev_info(&interface->dev, "%s\n", __func__); + } +-- +2.43.0 + diff --git a/queue-6.1/net-dsa-mv88e6xxx-correct-check-for-empty-list.patch b/queue-6.1/net-dsa-mv88e6xxx-correct-check-for-empty-list.patch new file mode 100644 index 00000000000..8f31ed8b349 --- /dev/null +++ b/queue-6.1/net-dsa-mv88e6xxx-correct-check-for-empty-list.patch @@ -0,0 +1,50 @@ +From 1a5ea6f306e6a0b76ae42a730fc6d079d9245ba4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Apr 2024 18:46:45 +0100 +Subject: net: dsa: mv88e6xxx: Correct check for empty list + +From: Simon Horman + +[ Upstream commit 4c7f3950a9fd53a62b156c0fe7c3a2c43b0ba19b ] + +Since commit a3c53be55c95 ("net: dsa: mv88e6xxx: Support multiple MDIO +busses") mv88e6xxx_default_mdio_bus() has checked that the +return value of list_first_entry() is non-NULL. + +This appears to be intended to guard against the list chip->mdios being +empty. However, it is not the correct check as the implementation of +list_first_entry is not designed to return NULL for empty lists. + +Instead, use list_first_entry_or_null() which does return NULL if the +list is empty. + +Flagged by Smatch. +Compile tested only. + +Reviewed-by: Andrew Lunn +Signed-off-by: Simon Horman +Link: https://lore.kernel.org/r/20240430-mv88e6xx-list_empty-v3-1-c35c69d88d2e@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c +index dc4ff8a6d0bf5..4938550a67c02 100644 +--- a/drivers/net/dsa/mv88e6xxx/chip.c ++++ b/drivers/net/dsa/mv88e6xxx/chip.c +@@ -131,8 +131,8 @@ struct mii_bus *mv88e6xxx_default_mdio_bus(struct mv88e6xxx_chip *chip) + { + struct mv88e6xxx_mdio_bus *mdio_bus; + +- mdio_bus = list_first_entry(&chip->mdios, struct mv88e6xxx_mdio_bus, +- list); ++ mdio_bus = list_first_entry_or_null(&chip->mdios, ++ struct mv88e6xxx_mdio_bus, list); + if (!mdio_bus) + return NULL; + +-- +2.43.0 + diff --git a/queue-6.1/nilfs2-convert-bug_on-in-nilfs_finish_roll_forward-t.patch b/queue-6.1/nilfs2-convert-bug_on-in-nilfs_finish_roll_forward-t.patch new file mode 100644 index 00000000000..b73525e813d --- /dev/null +++ b/queue-6.1/nilfs2-convert-bug_on-in-nilfs_finish_roll_forward-t.patch @@ -0,0 +1,45 @@ +From ffe3a976d714d07c034a0caee939bc94ca82b30f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 May 2024 07:14:29 +0900 +Subject: nilfs2: convert BUG_ON() in nilfs_finish_roll_forward() to WARN_ON() + +From: Ryusuke Konishi + +[ Upstream commit 0a73eac1ed10097d1799c10dff2172605fd40c75 ] + +The BUG_ON check performed on the return value of __getblk() in +nilfs_finish_roll_forward() assumes that a buffer that has been +successfully read once is retrieved with the same parameters and does not +fail (__getblk() does not return an error due to memory allocation +failure). Also, nilfs_finish_roll_forward() is called at most once during +mount. + +Taking these into consideration, rewrite the check to use WARN_ON() to +avoid using BUG_ON(). + +Link: https://lkml.kernel.org/r/20240508221429.7559-1-konishi.ryusuke@gmail.com +Signed-off-by: Ryusuke Konishi +Signed-off-by: Andrew Morton +Signed-off-by: Sasha Levin +--- + fs/nilfs2/recovery.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fs/nilfs2/recovery.c b/fs/nilfs2/recovery.c +index a9b8d77c8c1d5..3be374fee5c13 100644 +--- a/fs/nilfs2/recovery.c ++++ b/fs/nilfs2/recovery.c +@@ -698,7 +698,9 @@ static void nilfs_finish_roll_forward(struct the_nilfs *nilfs, + return; + + bh = __getblk(nilfs->ns_bdev, ri->ri_lsegs_start, nilfs->ns_blocksize); +- BUG_ON(!bh); ++ if (WARN_ON(!bh)) ++ return; /* should never happen */ ++ + memset(bh->b_data, 0, bh->b_size); + set_buffer_dirty(bh); + err = sync_dirty_buffer(bh); +-- +2.43.0 + diff --git a/queue-6.1/orangefs-fix-out-of-bounds-fsid-access.patch b/queue-6.1/orangefs-fix-out-of-bounds-fsid-access.patch new file mode 100644 index 00000000000..dcd3c721bd2 --- /dev/null +++ b/queue-6.1/orangefs-fix-out-of-bounds-fsid-access.patch @@ -0,0 +1,43 @@ +From b5a08b3bb8a9d30294bcb99931b5eaf06c82657b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 May 2024 16:20:36 -0400 +Subject: orangefs: fix out-of-bounds fsid access + +From: Mike Marshall + +[ Upstream commit 53e4efa470d5fc6a96662d2d3322cfc925818517 ] + +Arnd Bergmann sent a patch to fsdevel, he says: + +"orangefs_statfs() copies two consecutive fields of the superblock into +the statfs structure, which triggers a warning from the string fortification +helpers" + +Jan Kara suggested an alternate way to do the patch to make it more readable. + +I ran both ideas through xfstests and both seem fine. This patch +is based on Jan Kara's suggestion. + +Signed-off-by: Mike Marshall +Signed-off-by: Sasha Levin +--- + fs/orangefs/super.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c +index 4ca8ed410c3cf..24e028c119c1b 100644 +--- a/fs/orangefs/super.c ++++ b/fs/orangefs/super.c +@@ -201,7 +201,8 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) + (long)new_op->downcall.resp.statfs.files_avail); + + buf->f_type = sb->s_magic; +- memcpy(&buf->f_fsid, &ORANGEFS_SB(sb)->fs_id, sizeof(buf->f_fsid)); ++ buf->f_fsid.val[0] = ORANGEFS_SB(sb)->fs_id; ++ buf->f_fsid.val[1] = ORANGEFS_SB(sb)->id; + buf->f_bsize = new_op->downcall.resp.statfs.block_size; + buf->f_namelen = ORANGEFS_NAME_MAX; + +-- +2.43.0 + diff --git a/queue-6.1/powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch b/queue-6.1/powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch new file mode 100644 index 00000000000..9b7face0c3c --- /dev/null +++ b/queue-6.1/powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch @@ -0,0 +1,49 @@ +From 5bdc359ce8f6ae9c47e6cbe9ff29666272e2ee84 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 May 2024 17:56:19 +1000 +Subject: powerpc/64: Set _IO_BASE to POISON_POINTER_DELTA not 0 for + CONFIG_PCI=n + +From: Michael Ellerman + +[ Upstream commit be140f1732b523947425aaafbe2e37b41b622d96 ] + +There is code that builds with calls to IO accessors even when +CONFIG_PCI=n, but the actual calls are guarded by runtime checks. + +If not those calls would be faulting, because the page at virtual +address zero is (usually) not mapped into the kernel. As Arnd pointed +out, it is possible a large port value could cause the address to be +above mmap_min_addr which would then access userspace, which would be +a bug. + +To avoid any such issues, set _IO_BASE to POISON_POINTER_DELTA. That +is a value chosen to point into unmapped space between the kernel and +userspace, so any access will always fault. + +Note that on 32-bit POISON_POINTER_DELTA is 0, so the patch only has an +effect on 64-bit. + +Signed-off-by: Michael Ellerman +Link: https://msgid.link/20240503075619.394467-2-mpe@ellerman.id.au +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/io.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h +index 0e1745e5125b0..6d3ce049babdf 100644 +--- a/arch/powerpc/include/asm/io.h ++++ b/arch/powerpc/include/asm/io.h +@@ -42,7 +42,7 @@ extern struct pci_dev *isa_bridge_pcidev; + * define properly based on the platform + */ + #ifndef CONFIG_PCI +-#define _IO_BASE 0 ++#define _IO_BASE POISON_POINTER_DELTA + #define _ISA_MEM_BASE 0 + #define PCI_DRAM_OFFSET 0 + #elif defined(CONFIG_PPC32) +-- +2.43.0 + diff --git a/queue-6.1/powerpc-avoid-nmi_enter-nmi_exit-in-real-mode-interr.patch b/queue-6.1/powerpc-avoid-nmi_enter-nmi_exit-in-real-mode-interr.patch new file mode 100644 index 00000000000..070f1e06ae9 --- /dev/null +++ b/queue-6.1/powerpc-avoid-nmi_enter-nmi_exit-in-real-mode-interr.patch @@ -0,0 +1,116 @@ +From cfa724e7c8c0c510754739ca01136a06b8fee283 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Apr 2024 10:00:06 +0530 +Subject: powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt. + +From: Mahesh Salgaonkar + +[ Upstream commit 0db880fc865ffb522141ced4bfa66c12ab1fbb70 ] + +nmi_enter()/nmi_exit() touches per cpu variables which can lead to kernel +crash when invoked during real mode interrupt handling (e.g. early HMI/MCE +interrupt handler) if percpu allocation comes from vmalloc area. + +Early HMI/MCE handlers are called through DEFINE_INTERRUPT_HANDLER_NMI() +wrapper which invokes nmi_enter/nmi_exit calls. We don't see any issue when +percpu allocation is from the embedded first chunk. However with +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK enabled there are chances where percpu +allocation can come from the vmalloc area. + +With kernel command line "percpu_alloc=page" we can force percpu allocation +to come from vmalloc area and can see kernel crash in machine_check_early: + +[ 1.215714] NIP [c000000000e49eb4] rcu_nmi_enter+0x24/0x110 +[ 1.215717] LR [c0000000000461a0] machine_check_early+0xf0/0x2c0 +[ 1.215719] --- interrupt: 200 +[ 1.215720] [c000000fffd73180] [0000000000000000] 0x0 (unreliable) +[ 1.215722] [c000000fffd731b0] [0000000000000000] 0x0 +[ 1.215724] [c000000fffd73210] [c000000000008364] machine_check_early_common+0x134/0x1f8 + +Fix this by avoiding use of nmi_enter()/nmi_exit() in real mode if percpu +first chunk is not embedded. + +Reviewed-by: Christophe Leroy +Tested-by: Shirisha Ganta +Signed-off-by: Mahesh Salgaonkar +Signed-off-by: Michael Ellerman +Link: https://msgid.link/20240410043006.81577-1-mahesh@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/interrupt.h | 10 ++++++++++ + arch/powerpc/include/asm/percpu.h | 10 ++++++++++ + arch/powerpc/kernel/setup_64.c | 2 ++ + 3 files changed, 22 insertions(+) + +diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h +index 6d8492b6e2b83..4999de47b4a38 100644 +--- a/arch/powerpc/include/asm/interrupt.h ++++ b/arch/powerpc/include/asm/interrupt.h +@@ -355,6 +355,14 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct inte + if (IS_ENABLED(CONFIG_KASAN)) + return; + ++ /* ++ * Likewise, do not use it in real mode if percpu first chunk is not ++ * embedded. With CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK enabled there ++ * are chances where percpu allocation can come from vmalloc area. ++ */ ++ if (percpu_first_chunk_is_paged) ++ return; ++ + /* Otherwise, it should be safe to call it */ + nmi_enter(); + } +@@ -370,6 +378,8 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct inter + // no nmi_exit for a pseries hash guest taking a real mode exception + } else if (IS_ENABLED(CONFIG_KASAN)) { + // no nmi_exit for KASAN in real mode ++ } else if (percpu_first_chunk_is_paged) { ++ // no nmi_exit if percpu first chunk is not embedded + } else { + nmi_exit(); + } +diff --git a/arch/powerpc/include/asm/percpu.h b/arch/powerpc/include/asm/percpu.h +index 8e5b7d0b851c6..634970ce13c6b 100644 +--- a/arch/powerpc/include/asm/percpu.h ++++ b/arch/powerpc/include/asm/percpu.h +@@ -15,6 +15,16 @@ + #endif /* CONFIG_SMP */ + #endif /* __powerpc64__ */ + ++#if defined(CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK) && defined(CONFIG_SMP) ++#include ++DECLARE_STATIC_KEY_FALSE(__percpu_first_chunk_is_paged); ++ ++#define percpu_first_chunk_is_paged \ ++ (static_key_enabled(&__percpu_first_chunk_is_paged.key)) ++#else ++#define percpu_first_chunk_is_paged false ++#endif /* CONFIG_PPC64 && CONFIG_SMP */ ++ + #include + + #include +diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c +index b2e0d3ce4261c..7662265f24337 100644 +--- a/arch/powerpc/kernel/setup_64.c ++++ b/arch/powerpc/kernel/setup_64.c +@@ -834,6 +834,7 @@ static __init int pcpu_cpu_to_node(int cpu) + + unsigned long __per_cpu_offset[NR_CPUS] __read_mostly; + EXPORT_SYMBOL(__per_cpu_offset); ++DEFINE_STATIC_KEY_FALSE(__percpu_first_chunk_is_paged); + + void __init setup_per_cpu_areas(void) + { +@@ -876,6 +877,7 @@ void __init setup_per_cpu_areas(void) + if (rc < 0) + panic("cannot initialize percpu area (err=%d)", rc); + ++ static_key_enable(&__percpu_first_chunk_is_paged.key); + delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start; + for_each_possible_cpu(cpu) { + __per_cpu_offset[cpu] = delta + pcpu_unit_offsets[cpu]; +-- +2.43.0 + diff --git a/queue-6.1/powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch b/queue-6.1/powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch new file mode 100644 index 00000000000..bb8ab0bd460 --- /dev/null +++ b/queue-6.1/powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch @@ -0,0 +1,61 @@ +From a7399eb05ac85389a7d92218c2ec522e28f93fbb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Mar 2021 19:11:10 +0100 +Subject: powerpc/xmon: Check cpu id in commands "c#", "dp#" and "dx#" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Greg Kurz + +[ Upstream commit 8873aab8646194a4446117bb617cc71bddda2dee ] + +All these commands end up peeking into the PACA using the user +originated cpu id as an index. Check the cpu id is valid in order +to prevent xmon to crash. Instead of printing an error, this follows +the same behavior as the "lp s #" command : ignore the buggy cpu id +parameter and fall back to the #-less version of the command. + +Signed-off-by: Greg Kurz +Reviewed-by: Cédric Le Goater +Signed-off-by: Michael Ellerman +Link: https://msgid.link/161531347060.252863.10490063933688958044.stgit@bahia.lan +Signed-off-by: Sasha Levin +--- + arch/powerpc/xmon/xmon.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c +index cd692f399cd18..72307168d38ac 100644 +--- a/arch/powerpc/xmon/xmon.c ++++ b/arch/powerpc/xmon/xmon.c +@@ -1354,7 +1354,7 @@ static int cpu_cmd(void) + } + termch = cpu; + +- if (!scanhex(&cpu)) { ++ if (!scanhex(&cpu) || cpu >= num_possible_cpus()) { + /* print cpus waiting or in xmon */ + printf("cpus stopped:"); + last_cpu = first_cpu = NR_CPUS; +@@ -2776,7 +2776,7 @@ static void dump_pacas(void) + + termch = c; /* Put c back, it wasn't 'a' */ + +- if (scanhex(&num)) ++ if (scanhex(&num) && num < num_possible_cpus()) + dump_one_paca(num); + else + dump_one_paca(xmon_owner); +@@ -2849,7 +2849,7 @@ static void dump_xives(void) + + termch = c; /* Put c back, it wasn't 'a' */ + +- if (scanhex(&num)) ++ if (scanhex(&num) && num < num_possible_cpus()) + dump_one_xive(num); + else + dump_one_xive(xmon_owner); +-- +2.43.0 + diff --git a/queue-6.1/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch b/queue-6.1/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch new file mode 100644 index 00000000000..a9e1f3b3f6a --- /dev/null +++ b/queue-6.1/s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch @@ -0,0 +1,47 @@ +From 74f169f8093a50991425ca0fa89a0ff76d6c9994 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Apr 2024 16:30:01 +0200 +Subject: s390: Mark psw in __load_psw_mask() as __unitialized + +From: Sven Schnelle + +[ Upstream commit 7278a8fb8d032dfdc03d9b5d17e0bc451cdc1492 ] + +Without __unitialized, the following code is generated when +INIT_STACK_ALL_ZERO is enabled: + +86: d7 0f f0 a0 f0 a0 xc 160(16,%r15), 160(%r15) +8c: e3 40 f0 a0 00 24 stg %r4, 160(%r15) +92: c0 10 00 00 00 08 larl %r1, 0xa2 +98: e3 10 f0 a8 00 24 stg %r1, 168(%r15) +9e: b2 b2 f0 a0 lpswe 160(%r15) + +The xc is not adding any security because psw is fully initialized +with the following instructions. Add __unitialized to the psw +definitiation to avoid the superfluous clearing of psw. + +Reviewed-by: Heiko Carstens +Signed-off-by: Sven Schnelle +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + arch/s390/include/asm/processor.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h +index c907f747d2a04..26861b09293f1 100644 +--- a/arch/s390/include/asm/processor.h ++++ b/arch/s390/include/asm/processor.h +@@ -250,8 +250,8 @@ static inline void __load_psw(psw_t psw) + */ + static __always_inline void __load_psw_mask(unsigned long mask) + { ++ psw_t psw __uninitialized; + unsigned long addr; +- psw_t psw; + + psw.mask = mask; + +-- +2.43.0 + diff --git a/queue-6.1/s390-pkey-wipe-sensitive-data-on-failure.patch b/queue-6.1/s390-pkey-wipe-sensitive-data-on-failure.patch new file mode 100644 index 00000000000..4dda17aca10 --- /dev/null +++ b/queue-6.1/s390-pkey-wipe-sensitive-data-on-failure.patch @@ -0,0 +1,47 @@ +From 5500b04fd3a01e91d8a04a5e91fcd823d0d6324e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 17:03:18 +0200 +Subject: s390/pkey: Wipe sensitive data on failure + +From: Holger Dengler + +[ Upstream commit 1d8c270de5eb74245d72325d285894a577a945d9 ] + +Wipe sensitive data from stack also if the copy_to_user() fails. + +Suggested-by: Heiko Carstens +Reviewed-by: Harald Freudenberger +Reviewed-by: Ingo Franzki +Acked-by: Heiko Carstens +Signed-off-by: Holger Dengler +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + drivers/s390/crypto/pkey_api.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c +index df0f19e6d9235..17885c9f55cb2 100644 +--- a/drivers/s390/crypto/pkey_api.c ++++ b/drivers/s390/crypto/pkey_api.c +@@ -1191,7 +1191,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, + if (rc) + break; + if (copy_to_user(ucs, &kcs, sizeof(kcs))) +- return -EFAULT; ++ rc = -EFAULT; + memzero_explicit(&kcs, sizeof(kcs)); + break; + } +@@ -1223,7 +1223,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, + if (rc) + break; + if (copy_to_user(ucp, &kcp, sizeof(kcp))) +- return -EFAULT; ++ rc = -EFAULT; + memzero_explicit(&kcp, sizeof(kcp)); + break; + } +-- +2.43.0 + diff --git a/queue-6.1/scsi-mpi3mr-sanitise-num_phys.patch b/queue-6.1/scsi-mpi3mr-sanitise-num_phys.patch new file mode 100644 index 00000000000..d3d5f10f187 --- /dev/null +++ b/queue-6.1/scsi-mpi3mr-sanitise-num_phys.patch @@ -0,0 +1,50 @@ +From 735af944474b1b8546cc13ae8bf6ce8b7b9fe532 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 26 Feb 2024 16:10:13 +0100 +Subject: scsi: mpi3mr: Sanitise num_phys + +From: Tomas Henzl + +[ Upstream commit 3668651def2c1622904e58b0280ee93121f2b10b ] + +Information is stored in mr_sas_port->phy_mask, values larger then size of +this field shouldn't be allowed. + +Signed-off-by: Tomas Henzl +Link: https://lore.kernel.org/r/20240226151013.8653-1-thenzl@redhat.com +Acked-by: Sathya Prakash Veerichetty +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/scsi/mpi3mr/mpi3mr_transport.c b/drivers/scsi/mpi3mr/mpi3mr_transport.c +index 5748bd9369ff7..fc54844032aa8 100644 +--- a/drivers/scsi/mpi3mr/mpi3mr_transport.c ++++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c +@@ -1355,11 +1355,21 @@ static struct mpi3mr_sas_port *mpi3mr_sas_port_add(struct mpi3mr_ioc *mrioc, + mpi3mr_sas_port_sanity_check(mrioc, mr_sas_node, + mr_sas_port->remote_identify.sas_address, hba_port); + ++ if (mr_sas_node->num_phys > sizeof(mr_sas_port->phy_mask) * 8) ++ ioc_info(mrioc, "max port count %u could be too high\n", ++ mr_sas_node->num_phys); ++ + for (i = 0; i < mr_sas_node->num_phys; i++) { + if ((mr_sas_node->phy[i].remote_identify.sas_address != + mr_sas_port->remote_identify.sas_address) || + (mr_sas_node->phy[i].hba_port != hba_port)) + continue; ++ ++ if (i > sizeof(mr_sas_port->phy_mask) * 8) { ++ ioc_warn(mrioc, "skipping port %u, max allowed value is %lu\n", ++ i, sizeof(mr_sas_port->phy_mask) * 8); ++ goto out_fail; ++ } + list_add_tail(&mr_sas_node->phy[i].port_siblings, + &mr_sas_port->phy_list); + mr_sas_port->num_phys++; +-- +2.43.0 + diff --git a/queue-6.1/scsi-qedf-make-qedf_execute_tmf-non-preemptible.patch b/queue-6.1/scsi-qedf-make-qedf_execute_tmf-non-preemptible.patch new file mode 100644 index 00000000000..9a5e4bcf208 --- /dev/null +++ b/queue-6.1/scsi-qedf-make-qedf_execute_tmf-non-preemptible.patch @@ -0,0 +1,54 @@ +From e6f915a9ae93971512b21d557ed6d76c0fa2251d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Apr 2024 11:01:55 -0400 +Subject: scsi: qedf: Make qedf_execute_tmf() non-preemptible + +From: John Meneghini + +[ Upstream commit 0d8b637c9c5eeaa1a4e3dfb336f3ff918eb64fec ] + +Stop calling smp_processor_id() from preemptible code in +qedf_execute_tmf90. This results in BUG_ON() when running an RT kernel. + +[ 659.343280] BUG: using smp_processor_id() in preemptible [00000000] code: sg_reset/3646 +[ 659.343282] caller is qedf_execute_tmf+0x8b/0x360 [qedf] + +Tested-by: Guangwu Zhang +Cc: Saurav Kashyap +Cc: Nilesh Javali +Signed-off-by: John Meneghini +Link: https://lore.kernel.org/r/20240403150155.412954-1-jmeneghi@redhat.com +Acked-by: Saurav Kashyap +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qedf/qedf_io.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c +index 10fe3383855c0..031e605b3f427 100644 +--- a/drivers/scsi/qedf/qedf_io.c ++++ b/drivers/scsi/qedf/qedf_io.c +@@ -2331,9 +2331,6 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, + io_req->fcport = fcport; + io_req->cmd_type = QEDF_TASK_MGMT_CMD; + +- /* Record which cpu this request is associated with */ +- io_req->cpu = smp_processor_id(); +- + /* Set TM flags */ + io_req->io_req_flags = QEDF_READ; + io_req->data_xfer_len = 0; +@@ -2355,6 +2352,9 @@ static int qedf_execute_tmf(struct qedf_rport *fcport, struct scsi_cmnd *sc_cmd, + + spin_lock_irqsave(&fcport->rport_lock, flags); + ++ /* Record which cpu this request is associated with */ ++ io_req->cpu = smp_processor_id(); ++ + sqe_idx = qedf_get_sqe_idx(fcport); + sqe = &fcport->sq[sqe_idx]; + memset(sqe, 0, sizeof(struct fcoe_wqe)); +-- +2.43.0 + diff --git a/queue-6.1/sctp-prefer-struct_size-over-open-coded-arithmetic.patch b/queue-6.1/sctp-prefer-struct_size-over-open-coded-arithmetic.patch new file mode 100644 index 00000000000..f3a6d157a5c --- /dev/null +++ b/queue-6.1/sctp-prefer-struct_size-over-open-coded-arithmetic.patch @@ -0,0 +1,74 @@ +From 2b599158ae5b80f89fe56c42e92876bb64c431f3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 27 Apr 2024 19:23:36 +0200 +Subject: sctp: prefer struct_size over open coded arithmetic + +From: Erick Archer + +[ Upstream commit e5c5f3596de224422561d48eba6ece5210d967b3 ] + +This is an effort to get rid of all multiplications from allocation +functions in order to prevent integer overflows [1][2]. + +As the "ids" variable is a pointer to "struct sctp_assoc_ids" and this +structure ends in a flexible array: + +struct sctp_assoc_ids { + [...] + sctp_assoc_t gaids_assoc_id[]; +}; + +the preferred way in the kernel is to use the struct_size() helper to +do the arithmetic instead of the calculation "size + size * count" in +the kmalloc() function. + +Also, refactor the code adding the "ids_size" variable to avoid sizing +twice. + +This way, the code is more readable and safer. + +This code was detected with the help of Coccinelle, and audited and +modified manually. + +Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments [1] +Link: https://github.com/KSPP/linux/issues/160 [2] +Signed-off-by: Erick Archer +Acked-by: Xin Long +Reviewed-by: Kees Cook +Link: https://lore.kernel.org/r/PAXPR02MB724871DB78375AB06B5171C88B152@PAXPR02MB7248.eurprd02.prod.outlook.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/sctp/socket.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/net/sctp/socket.c b/net/sctp/socket.c +index 237a6b04adf6f..9689d2f2d91f9 100644 +--- a/net/sctp/socket.c ++++ b/net/sctp/socket.c +@@ -7116,6 +7116,7 @@ static int sctp_getsockopt_assoc_ids(struct sock *sk, int len, + struct sctp_sock *sp = sctp_sk(sk); + struct sctp_association *asoc; + struct sctp_assoc_ids *ids; ++ size_t ids_size; + u32 num = 0; + + if (sctp_style(sk, TCP)) +@@ -7128,11 +7129,11 @@ static int sctp_getsockopt_assoc_ids(struct sock *sk, int len, + num++; + } + +- if (len < sizeof(struct sctp_assoc_ids) + sizeof(sctp_assoc_t) * num) ++ ids_size = struct_size(ids, gaids_assoc_id, num); ++ if (len < ids_size) + return -EINVAL; + +- len = sizeof(struct sctp_assoc_ids) + sizeof(sctp_assoc_t) * num; +- ++ len = ids_size; + ids = kmalloc(len, GFP_USER | __GFP_NOWARN); + if (unlikely(!ids)) + return -ENOMEM; +-- +2.43.0 + diff --git a/queue-6.1/serial-imx-raise-tx-trigger-level-to-8.patch b/queue-6.1/serial-imx-raise-tx-trigger-level-to-8.patch new file mode 100644 index 00000000000..10f3a78539b --- /dev/null +++ b/queue-6.1/serial-imx-raise-tx-trigger-level-to-8.patch @@ -0,0 +1,45 @@ +From 5f91c91e6a1c9350ceff257e0866b1081f51eb57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 May 2024 15:37:44 +0200 +Subject: serial: imx: Raise TX trigger level to 8 + +From: Matthias Schiffer + +[ Upstream commit a3d8728ab079951741efa11360df43dbfacba7ab ] + +At the default TX trigger level of 2 in non-DMA mode (meaning that an +interrupt is generated when less than 2 characters are left in the +FIFO), we have observed frequent buffer underruns at 115200 Baud on an +i.MX8M Nano. This can cause communication issues if the receiving side +expects a continuous transfer. + +Increasing the level to 8 makes the UART trigger an interrupt earlier, +giving the kernel enough time to refill the FIFO, at the cost of +triggering one interrupt per ~24 instead of ~30 bytes of transmitted +data (as the i.MX UART has a 32 byte FIFO). + +Signed-off-by: Michael Krummsdorf +Signed-off-by: Matthias Schiffer +Link: https://lore.kernel.org/r/20240508133744.35858-1-matthias.schiffer@ew.tq-group.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/imx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c +index 40e59e72d5e9e..5acbab0512b82 100644 +--- a/drivers/tty/serial/imx.c ++++ b/drivers/tty/serial/imx.c +@@ -1303,7 +1303,7 @@ static void imx_uart_clear_rx_errors(struct imx_port *sport) + + } + +-#define TXTL_DEFAULT 2 /* reset default */ ++#define TXTL_DEFAULT 8 + #define RXTL_DEFAULT 8 /* 8 characters or aging timer */ + #define TXTL_DMA 8 /* DMA burst setting */ + #define RXTL_DMA 9 /* DMA burst setting */ +-- +2.43.0 + diff --git a/queue-6.1/series b/queue-6.1/series new file mode 100644 index 00000000000..42a82251d29 --- /dev/null +++ b/queue-6.1/series @@ -0,0 +1,46 @@ +locking-mutex-introduce-devm_mutex_init.patch +crypto-hisilicon-debugfs-fix-debugfs-uninit-process-.patch +drm-lima-fix-shared-irq-handling-on-driver-remove.patch +powerpc-avoid-nmi_enter-nmi_exit-in-real-mode-interr.patch +media-dvb-as102-fe-fix-as10x_register_addr-packing.patch +media-dvb-usb-dib0700_devices-add-missing-release_fi.patch +ib-core-implement-a-limit-on-umad-receive-list.patch +drm-i915-fix-gt-reset-with-guc-submission-is-disable.patch +scsi-qedf-make-qedf_execute_tmf-non-preemptible.patch +irqchip-gic-v3-its-remove-bug_on-in-its_vpe_irq_doma.patch +crypto-aead-cipher-zeroize-key-buffer-after-use.patch +drm-amdgpu-fix-uninitialized-variable-warnings.patch +drm-amdgpu-initialize-timestamp-for-some-legacy-socs.patch +drm-amd-display-check-index-msg_id-before-read-or-wr.patch +drm-amd-display-check-pipe-offset-before-setting-vbl.patch +drm-amd-display-skip-finding-free-audio-for-unknown-.patch +drm-amdgpu-fix-uninitialized-scalar-variable-warning.patch +drm-amdgpu-fix-the-warning-about-the-expression-int-.patch +media-dw2102-don-t-translate-i2c-read-into-write.patch +sctp-prefer-struct_size-over-open-coded-arithmetic.patch +firmware-dmi-stop-decoding-on-broken-entry.patch +input-ff-core-prefer-struct_size-over-open-coded-ari.patch +usb-xhci-prevent-potential-failure-in-handle_tx_even.patch +wifi-mt76-replace-skb_put-with-skb_put_zero.patch +net-dsa-mv88e6xxx-correct-check-for-empty-list.patch +media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch +media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch +media-dvb-frontends-tda10048-fix-integer-overflow.patch +i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch +powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch +orangefs-fix-out-of-bounds-fsid-access.patch +kunit-fix-timeout-message.patch +kunit-handle-test-faults.patch +powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch +igc-fix-a-log-entry-using-uninitialized-netdev.patch +bpf-avoid-uninitialized-value-in-bpf_core_read_bitfi.patch +f2fs-check-validation-of-fault-attrs-in-f2fs_build_f.patch +scsi-mpi3mr-sanitise-num_phys.patch +serial-imx-raise-tx-trigger-level-to-8.patch +nilfs2-convert-bug_on-in-nilfs_finish_roll_forward-t.patch +jffs2-fix-potential-illegal-address-access-in-jffs2_.patch +s390-mark-psw-in-__load_psw_mask-as-__unitialized.patch +s390-pkey-wipe-sensitive-data-on-failure.patch +btrfs-scrub-initialize-ret-in-scrub_simple_mirror-to.patch +cdrom-rearrange-last_media_change-check-to-avoid-uni.patch +tools-power-turbostat-remember-global-max_die_id.patch diff --git a/queue-6.1/tools-power-turbostat-remember-global-max_die_id.patch b/queue-6.1/tools-power-turbostat-remember-global-max_die_id.patch new file mode 100644 index 00000000000..36ecfb795f2 --- /dev/null +++ b/queue-6.1/tools-power-turbostat-remember-global-max_die_id.patch @@ -0,0 +1,65 @@ +From ad0b7d795b5fe98e6c78cda287ba14c996b81494 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 21 Apr 2024 11:56:48 -0400 +Subject: tools/power turbostat: Remember global max_die_id + +From: Len Brown + +[ Upstream commit cda203388687aa075db6f8996c3c4549fa518ea8 ] + +This is necessary to gracefully handle sparse die_id's. + +no functional change + +Signed-off-by: Len Brown +Signed-off-by: Sasha Levin +--- + tools/power/x86/turbostat/turbostat.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c +index a41bad8e653bb..66e31da942588 100644 +--- a/tools/power/x86/turbostat/turbostat.c ++++ b/tools/power/x86/turbostat/turbostat.c +@@ -566,6 +566,7 @@ struct topo_params { + int num_cpus; + int num_cores; + int max_cpu_num; ++ int max_die_id; + int max_node_num; + int nodes_per_pkg; + int cores_per_node; +@@ -5864,7 +5865,6 @@ void topology_probe() + int i; + int max_core_id = 0; + int max_package_id = 0; +- int max_die_id = 0; + int max_siblings = 0; + + /* Initialize num_cpus, max_cpu_num */ +@@ -5933,8 +5933,8 @@ void topology_probe() + + /* get die information */ + cpus[i].die_id = get_die_id(i); +- if (cpus[i].die_id > max_die_id) +- max_die_id = cpus[i].die_id; ++ if (cpus[i].die_id > topo.max_die_id) ++ topo.max_die_id = cpus[i].die_id; + + /* get numa node information */ + cpus[i].physical_node_id = get_physical_node_id(&cpus[i]); +@@ -5960,9 +5960,9 @@ void topology_probe() + if (!summary_only && topo.cores_per_node > 1) + BIC_PRESENT(BIC_Core); + +- topo.num_die = max_die_id + 1; ++ topo.num_die = topo.max_die_id + 1; + if (debug > 1) +- fprintf(outf, "max_die_id %d, sizing for %d die\n", max_die_id, topo.num_die); ++ fprintf(outf, "max_die_id %d, sizing for %d die\n", topo.max_die_id, topo.num_die); + if (!summary_only && topo.num_die > 1) + BIC_PRESENT(BIC_Die); + +-- +2.43.0 + diff --git a/queue-6.1/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch b/queue-6.1/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch new file mode 100644 index 00000000000..4fd158cf4f9 --- /dev/null +++ b/queue-6.1/usb-xhci-prevent-potential-failure-in-handle_tx_even.patch @@ -0,0 +1,54 @@ +From cca77c3e4115f737cb80d4ddc96baa033121b59e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Apr 2024 17:02:37 +0300 +Subject: usb: xhci: prevent potential failure in handle_tx_event() for + Transfer events without TRB + +From: Niklas Neronin + +[ Upstream commit 66cb618bf0bb82859875b00eeffaf223557cb416 ] + +Some transfer events don't always point to a TRB, and consequently don't +have a endpoint ring. In these cases, function handle_tx_event() should +not proceed, because if 'ep->skip' is set, the pointer to the endpoint +ring is used. + +To prevent a potential failure and make the code logical, return after +checking the completion code for a Transfer event without TRBs. + +Signed-off-by: Niklas Neronin +Signed-off-by: Mathias Nyman +Link: https://lore.kernel.org/r/20240429140245.3955523-11-mathias.nyman@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-ring.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c +index 7549c430c4f01..be5b0ff2966fe 100644 +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -2631,16 +2631,17 @@ static int handle_tx_event(struct xhci_hcd *xhci, + else + xhci_handle_halted_endpoint(xhci, ep, 0, NULL, + EP_SOFT_RESET); +- goto cleanup; ++ break; + case COMP_RING_UNDERRUN: + case COMP_RING_OVERRUN: + case COMP_STOPPED_LENGTH_INVALID: +- goto cleanup; ++ break; + default: + xhci_err(xhci, "ERROR Transfer event for unknown stream ring slot %u ep %u\n", + slot_id, ep_index); + goto err_out; + } ++ return 0; + } + + /* Count current td numbers if ep->skip is set */ +-- +2.43.0 + diff --git a/queue-6.1/wifi-mt76-replace-skb_put-with-skb_put_zero.patch b/queue-6.1/wifi-mt76-replace-skb_put-with-skb_put_zero.patch new file mode 100644 index 00000000000..ca76468d236 --- /dev/null +++ b/queue-6.1/wifi-mt76-replace-skb_put-with-skb_put_zero.patch @@ -0,0 +1,83 @@ +From 7c3e748ce53a7d01b9c1b77e3e0d4937d3d55142 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Mar 2024 17:02:52 +0100 +Subject: wifi: mt76: replace skb_put with skb_put_zero + +From: Felix Fietkau + +[ Upstream commit 7f819a2f4fbc510e088b49c79addcf1734503578 ] + +Avoid potentially reusing uninitialized data + +Signed-off-by: Felix Fietkau +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 10 +++++----- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +index 546cbe21aab31..6b5bfdbec8b11 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c ++++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +@@ -254,7 +254,7 @@ mt76_connac_mcu_add_nested_tlv(struct sk_buff *skb, int tag, int len, + }; + u16 ntlv; + +- ptlv = skb_put(skb, len); ++ ptlv = skb_put_zero(skb, len); + memcpy(ptlv, &tlv, sizeof(tlv)); + + ntlv = le16_to_cpu(ntlv_hdr->tlv_num); +@@ -1532,7 +1532,7 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif, + set_bit(MT76_HW_SCANNING, &phy->state); + mvif->scan_seq_num = (mvif->scan_seq_num + 1) & 0x7f; + +- req = (struct mt76_connac_hw_scan_req *)skb_put(skb, sizeof(*req)); ++ req = (struct mt76_connac_hw_scan_req *)skb_put_zero(skb, sizeof(*req)); + + req->seq_num = mvif->scan_seq_num | mvif->band_idx << 7; + req->bss_idx = mvif->idx; +@@ -1660,7 +1660,7 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy, + + mvif->scan_seq_num = (mvif->scan_seq_num + 1) & 0x7f; + +- req = (struct mt76_connac_sched_scan_req *)skb_put(skb, sizeof(*req)); ++ req = (struct mt76_connac_sched_scan_req *)skb_put_zero(skb, sizeof(*req)); + req->version = 1; + req->seq_num = mvif->scan_seq_num | mvif->band_idx << 7; + +@@ -2294,7 +2294,7 @@ int mt76_connac_mcu_update_gtk_rekey(struct ieee80211_hw *hw, + return -ENOMEM; + + skb_put_data(skb, &hdr, sizeof(hdr)); +- gtk_tlv = (struct mt76_connac_gtk_rekey_tlv *)skb_put(skb, ++ gtk_tlv = (struct mt76_connac_gtk_rekey_tlv *)skb_put_zero(skb, + sizeof(*gtk_tlv)); + gtk_tlv->tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_GTK_REKEY); + gtk_tlv->len = cpu_to_le16(sizeof(*gtk_tlv)); +@@ -2417,7 +2417,7 @@ mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev, + return -ENOMEM; + + skb_put_data(skb, &hdr, sizeof(hdr)); +- ptlv = (struct mt76_connac_wow_pattern_tlv *)skb_put(skb, sizeof(*ptlv)); ++ ptlv = (struct mt76_connac_wow_pattern_tlv *)skb_put_zero(skb, sizeof(*ptlv)); + ptlv->tag = cpu_to_le16(UNI_SUSPEND_WOW_PATTERN); + ptlv->len = cpu_to_le16(sizeof(*ptlv)); + ptlv->data_len = pattern->pattern_len; +diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +index b2ea539f697f7..65f07cc2acdd4 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +@@ -395,7 +395,7 @@ mt7915_mcu_add_nested_subtlv(struct sk_buff *skb, int sub_tag, int sub_len, + .len = cpu_to_le16(sub_len), + }; + +- ptlv = skb_put(skb, sub_len); ++ ptlv = skb_put_zero(skb, sub_len); + memcpy(ptlv, &tlv, sizeof(tlv)); + + le16_add_cpu(sub_ntlv, 1); +-- +2.43.0 +