October 2023 - Linux-stable-mirror

[PATCH v2] ext4: Properly sync file size update after O_SYNC direct IO

by Jan Kara

Gao Xiang has reported that on ext4 O_SYNC direct IO does not properly sync file size update and thus if we crash at unfortunate moment, the file can have smaller size although O_SYNC IO has reported successful completion. The problem happens because update of on-disk inode size is handled in ext4_dio_write_iter() *after* iomap_dio_rw() (and thus dio_complete() in particular) has returned and generic_file_sync() gets called by dio_complete(). Fix the problem by handling on-disk inode size update directly in our ->end_io completion handler. References: https://lore.kernel.org/all/02d18236-26ef-09b0-90ad-030c4fe3ee20@linux.alib… Reported-by: Gao Xiang <hsiangkao(a)linux.alibaba.com> CC: stable(a)vger.kernel.org Fixes: 378f32bab371 ("ext4: introduce direct I/O write using iomap infrastructure") Signed-off-by: Jan Kara <jack(a)suse.cz> --- fs/ext4/file.c | 139 ++++++++++++++++++------------------------------- 1 file changed, 52 insertions(+), 87 deletions(-) Changes since v1: * Rebased on top of Linus' tree (instead of a tree with iomap cleanup) * Made ext4_dio_write_end_io() always return number of written bytes on success for consistency * Added Fixes tag diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 6830ea3a6c59..40066a5db8e8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -306,80 +306,34 @@ static ssize_t ext4_buffered_write_iter(struct kiocb *iocb, } static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset, - ssize_t written, size_t count) + ssize_t count) { handle_t *handle; - bool truncate = false; - u8 blkbits = inode->i_blkbits; - ext4_lblk_t written_blk, end_blk; - int ret; - - /* - * Note that EXT4_I(inode)->i_disksize can get extended up to - * inode->i_size while the I/O was running due to writeback of delalloc - * blocks. But, the code in ext4_iomap_alloc() is careful to use - * zeroed/unwritten extents if this is possible; thus we won't leave - * uninitialized blocks in a file even if we didn't succeed in writing - * as much as we intended. - */ - WARN_ON_ONCE(i_size_read(inode) < EXT4_I(inode)->i_disksize); - if (offset + count <= EXT4_I(inode)->i_disksize) { - /* - * We need to ensure that the inode is removed from the orphan - * list if it has been added prematurely, due to writeback of - * delalloc blocks. - */ - if (!list_empty(&EXT4_I(inode)->i_orphan) && inode->i_nlink) { - handle = ext4_journal_start(inode, EXT4_HT_INODE, 2); - - if (IS_ERR(handle)) { - ext4_orphan_del(NULL, inode); - return PTR_ERR(handle); - } - - ext4_orphan_del(handle, inode); - ext4_journal_stop(handle); - } - - return written; - } - - if (written < 0) - goto truncate; + lockdep_assert_held_write(&inode->i_rwsem); handle = ext4_journal_start(inode, EXT4_HT_INODE, 2); - if (IS_ERR(handle)) { - written = PTR_ERR(handle); - goto truncate; - } + if (IS_ERR(handle)) + return PTR_ERR(handle); - if (ext4_update_inode_size(inode, offset + written)) { - ret = ext4_mark_inode_dirty(handle, inode); + if (ext4_update_inode_size(inode, offset + count)) { + int ret = ext4_mark_inode_dirty(handle, inode); if (unlikely(ret)) { - written = ret; ext4_journal_stop(handle); - goto truncate; + return ret; } } - /* - * We may need to truncate allocated but not written blocks beyond EOF. - */ - written_blk = ALIGN(offset + written, 1 << blkbits); - end_blk = ALIGN(offset + count, 1 << blkbits); - if (written_blk < end_blk && ext4_can_truncate(inode)) - truncate = true; - - /* - * Remove the inode from the orphan list if it has been extended and - * everything went OK. - */ - if (!truncate && inode->i_nlink) + if (inode->i_nlink) ext4_orphan_del(handle, inode); ext4_journal_stop(handle); - if (truncate) { -truncate: + return count; +} + +static void ext4_inode_extension_cleanup(struct inode *inode, ssize_t count) +{ + lockdep_assert_held_write(&inode->i_rwsem); + if (count < 0) { ext4_truncate_failed_write(inode); /* * If the truncate operation failed early, then the inode may @@ -388,9 +342,28 @@ static ssize_t ext4_handle_inode_extension(struct inode *inode, loff_t offset, */ if (inode->i_nlink) ext4_orphan_del(NULL, inode); + return; } + /* + * If i_disksize got extended due to writeback of delalloc blocks while + * the DIO was running we could fail to cleanup the orphan list in + * ext4_handle_inode_extension(). Do it now. + */ + if (!list_empty(&EXT4_I(inode)->i_orphan) && inode->i_nlink) { + handle_t *handle = ext4_journal_start(inode, EXT4_HT_INODE, 2); - return written; + if (IS_ERR(handle)) { + /* + * The write has successfully completed. Not much to + * do with the error here so just cleanup the orphan + * list and hope for the best. + */ + ext4_orphan_del(NULL, inode); + return; + } + ext4_orphan_del(handle, inode); + ext4_journal_stop(handle); + } } static int ext4_dio_write_end_io(struct kiocb *iocb, ssize_t size, @@ -399,31 +372,22 @@ static int ext4_dio_write_end_io(struct kiocb *iocb, ssize_t size, loff_t pos = iocb->ki_pos; struct inode *inode = file_inode(iocb->ki_filp); + if (!error && size && flags & IOMAP_DIO_UNWRITTEN) + error = ext4_convert_unwritten_extents(NULL, inode, pos, size); if (error) return error; - - if (size && flags & IOMAP_DIO_UNWRITTEN) { - error = ext4_convert_unwritten_extents(NULL, inode, pos, size); - if (error < 0) - return error; - } /* - * If we are extending the file, we have to update i_size here before - * page cache gets invalidated in iomap_dio_rw(). Otherwise racing - * buffered reads could zero out too much from page cache pages. Update - * of on-disk size will happen later in ext4_dio_write_iter() where - * we have enough information to also perform orphan list handling etc. - * Note that we perform all extending writes synchronously under - * i_rwsem held exclusively so i_size update is safe here in that case. - * If the write was not extending, we cannot see pos > i_size here - * because operations reducing i_size like truncate wait for all - * outstanding DIO before updating i_size. + * Note that EXT4_I(inode)->i_disksize can get extended up to + * inode->i_size while the I/O was running due to writeback of delalloc + * blocks. But the code in ext4_iomap_alloc() is careful to use + * zeroed/unwritten extents if this is possible; thus we won't leave + * uninitialized blocks in a file even if we didn't succeed in writing + * as much as we intended. */ - pos += size; - if (pos > i_size_read(inode)) - i_size_write(inode, pos); - - return 0; + WARN_ON_ONCE(i_size_read(inode) < READ_ONCE(EXT4_I(inode)->i_disksize)); + if (pos + size <= READ_ONCE(EXT4_I(inode)->i_disksize)) + return size; + return ext4_handle_inode_extension(inode, pos, size); } static const struct iomap_dio_ops ext4_dio_write_ops = { @@ -606,9 +570,8 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) dio_flags, NULL, 0); if (ret == -ENOTBLK) ret = 0; - if (extend) - ret = ext4_handle_inode_extension(inode, offset, ret, count); + ext4_inode_extension_cleanup(inode, ret); out: if (ilock_shared) @@ -689,8 +652,10 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) ret = dax_iomap_rw(iocb, from, &ext4_iomap_ops); - if (extend) - ret = ext4_handle_inode_extension(inode, offset, ret, count); + if (extend) { + ret = ext4_handle_inode_extension(inode, offset, ret); + ext4_inode_extension_cleanup(inode, ret); + } out: inode_unlock(inode); if (ret > 0) -- 2.35.3

1 year, 3 months

1
0
0 0

[PATCH] drm/nouveau/disp: fix DP capable DSM connectors

by Karol Herbst

Just special case DP DSM connectors until we properly figure out how to deal with this. This resolves user regressions on GPUs with such connectors without reverting the original fix. Cc: Lyude Paul <lyude(a)redhat.com> Cc: stable(a)vger.kernel.org # 6.4+ Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/255 Fixes: 2b5d1c29f6c4 ("drm/nouveau/disp: PIOR DP uses GPIO for HPD, not PMGR AUX interrupts") Signed-off-by: Karol Herbst <kherbst(a)redhat.com> --- drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c index 46b057fe1412e..3249e5c1c8930 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c @@ -62,6 +62,18 @@ nvkm_uconn_uevent_gpio(struct nvkm_object *object, u64 token, u32 bits) return object->client->event(token, &args, sizeof(args.v0)); } +static bool +nvkm_connector_is_dp_dms(u8 type) +{ + switch (type) { + case DCB_CONNECTOR_DMS59_DP0: + case DCB_CONNECTOR_DMS59_DP1: + return true; + default: + return false; + } +} + static int nvkm_uconn_uevent(struct nvkm_object *object, void *argv, u32 argc, struct nvkm_uevent *uevent) { @@ -101,7 +113,7 @@ nvkm_uconn_uevent(struct nvkm_object *object, void *argv, u32 argc, struct nvkm_ if (args->v0.types & NVIF_CONN_EVENT_V0_UNPLUG) bits |= NVKM_GPIO_LO; if (args->v0.types & NVIF_CONN_EVENT_V0_IRQ) { /* TODO: support DP IRQ on ANX9805 and remove this hack. */ - if (!outp->info.location) + if (!outp->info.location && !nvkm_connector_is_dp_dms(conn->info.type)) return -EINVAL; } -- 2.41.0

1 year, 3 months

2
1
0 0

stable-rc/linux-6.1.y build: 20 builds: 0 failed, 20 passed, 1 warning (v6.1.57-7-g3fe61dd155ac)

by kernelci.org bot

stable-rc/linux-6.1.y build: 20 builds: 0 failed, 20 passed, 1 warning (v6.1.57-7-g3fe61dd155ac) Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-6.1.y/kernel/v6.1.57-7-g3… Tree: stable-rc Branch: linux-6.1.y Git Describe: v6.1.57-7-g3fe61dd155ac Git Commit: 3fe61dd155ac48d1642f5cac17bd41a92ef585b7 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Built: 7 unique architectures Warnings Detected: arc: arm64: arm: i386: mips: 32r2el_defconfig (gcc-10): 1 warning riscv: x86_64: Warnings summary: 1 arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" ================================================================================ Detailed per-defconfig build reports: -------------------------------------------------------------------------------- 32r2el_defconfig (mips, gcc-10) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" -------------------------------------------------------------------------------- allnoconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig (arm64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig+arm64-chromebook (arm64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- haps_hs_smp_defconfig (arc, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- i386_defconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- imx_v6_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v5_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nommu_k210_defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nommu_k210_sdcard_defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap2plus_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rv32_defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vexpress_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig+x86-chromebook (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches --- For more info write to <info(a)kernelci.org>

1 year, 3 months

1
0
0 0

[PATCHv3] x86/alternatives: Disable KASAN in apply_alternatives()

by Kirill A. Shutemov

Fei has reported that KASAN triggers during apply_alternatives() on 5-level paging machine: BUG: KASAN: out-of-bounds in rcu_is_watching Read of size 4 at addr ff110003ee6419a0 by task swapper/0/0 ... __asan_load4 rcu_is_watching trace_hardirqs_on text_poke_early apply_alternatives ... On machines with 5-level paging, cpu_feature_enabled(X86_FEATURE_LA57) got patched. It includes KASAN code, where KASAN_SHADOW_START depends on __VIRTUAL_MASK_SHIFT, which is defined with the cpu_feature_enabled(). KASAN gets confused when apply_alternatives() patches the KASAN_SHADOW_START users. A test patch that makes KASAN_SHADOW_START static, by replacing __VIRTUAL_MASK_SHIFT with 56, fixes the issue. Disable KASAN while kernel patches alternatives. Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Reported-by: Fei Yang <fei.yang(a)intel.com> Fixes: 6657fca06e3f ("x86/mm: Allow to boot without LA57 if CONFIG_X86_5LEVEL=y") Cc: stable(a)vger.kernel.org --- v3: - Summarize KASAN splat; - Update comment in apply_alternatives(); v2: - Move kasan_disable/_enable_current() to cover whole loop, not only text_poke_early(); - Adjust commit message. --- arch/x86/kernel/alternative.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 517ee01503be..73be3931e4f0 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -403,6 +403,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, u8 insn_buff[MAX_PATCH_LEN]; DPRINTK(ALT, "alt table %px, -> %px", start, end); + + /* + * In the case CONFIG_X86_5LEVEL=y, KASAN_SHADOW_START is defined using + * cpu_feature_enabled(X86_FEATURE_LA57) and is therefore patched here. + * During the process, KASAN becomes confused seeing partial LA57 + * conversion and triggers a false-positive out-of-bound report. + * + * Disable KASAN until the patching is complete. + */ + kasan_disable_current(); + /* * The scan order should be from start to end. A later scanned * alternative code can overwrite previously scanned alternative code. @@ -452,6 +463,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, text_poke_early(instr, insn_buff, insn_buff_sz); } + + kasan_enable_current(); } static inline bool is_jcc32(struct insn *insn) -- 2.41.0

1 year, 3 months

2
1
0 0

FAILED: patch "[PATCH] ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x d93eeca627db512a56145285dc94feac5b88a1d4 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101257-educated-sloppy-c73d@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: d93eeca627db ("ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41 AMP") e43252db7e20 ("ALSA: hda/realtek - ALC287 I2S speaker platform support") c99c26b16c15 ("ALSA: hda/realtek: Add quirk for mute LEDs on HP ENVY x360 15-eu0xxx") 93dc18e11b1a ("ALSA: hda/realtek: Add quirk for HP Victus 16-d1xxx to enable mute LED") 3babae915f4c ("ALSA: hda/tas2781: Add tas2781 HDA driver") f7b069cf0881 ("ALSA: hda/realtek: Fix generic fixup definition for cs35l41 amp") 0659400f18c0 ("ALSA: hda/realtek: Enable Mute LED on HP Laptop 15s-eq2xxx") 067eb0845928 ("ALSA: hda/realtek: Add quirk for ThinkPad P1 Gen 6") 8eda19cd59ce ("ALSA: hda/realtek: Add quirks for Lenovo Z13/Z16 Gen2") 9a6804aa1c92 ("ALSA: hda/realtek: Enable mute/micmute LEDs on HP Elitebook, 645 G9") ca88eeb308a2 ("ALSA: hda/realtek: Enable mute/micmute LEDs on HP Spectre x360 13-aw0xxx") a4517c4f3423 ("ALSA: hda/realtek: Apply dual codec fixup for Dell Latitude laptops") 2912cdda734d ("ALSA: patch_realtek: Fix Dell Inspiron Plus 16") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From d93eeca627db512a56145285dc94feac5b88a1d4 Mon Sep 17 00:00:00 2001 From: Kailang Yang <kailang(a)realtek.com> Date: Thu, 21 Sep 2023 15:20:41 +0800 Subject: [PATCH] ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41 AMP This is merge model ALC287_FIXUP_THINKPAD_I2S_SPK and ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI. Signed-off-by: Kailang Yang <kailang(a)realtek.com> Fixes: f7b069cf0881 ("ALSA: hda/realtek: Fix generic fixup definition for cs35l41 amp") Link: https://lore.kernel.org/r/82a45234327c4c50b4988a27e9f64c37@realtek.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 751783f3a15c..48bb57bd8d11 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7343,6 +7343,7 @@ enum { ALC245_FIXUP_HP_MUTE_LED_COEFBIT, ALC245_FIXUP_HP_X360_MUTE_LEDS, ALC287_FIXUP_THINKPAD_I2S_SPK, + ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD, }; /* A special fixup for Lenovo C940 and Yoga Duet 7; @@ -9441,6 +9442,12 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc287_fixup_bind_dacs, }, + [ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc287_fixup_bind_dacs, + .chained = true, + .chain_id = ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -9988,14 +9995,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x22be, "Thinkpad X1 Carbon 8th", ALC285_FIXUP_THINKPAD_HEADSET_JACK), SND_PCI_QUIRK(0x17aa, 0x22c1, "Thinkpad P1 Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK), SND_PCI_QUIRK(0x17aa, 0x22c2, "Thinkpad X1 Extreme Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK), - SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), + SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),

1 year, 3 months

1
0
0 0

FAILED: patch "[PATCH] ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41" failed to apply to 6.5-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.5-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y git checkout FETCH_HEAD git cherry-pick -x d93eeca627db512a56145285dc94feac5b88a1d4 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101256-dicing-maximum-c28e@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^.. Possible dependencies: d93eeca627db ("ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41 AMP") e43252db7e20 ("ALSA: hda/realtek - ALC287 I2S speaker platform support") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From d93eeca627db512a56145285dc94feac5b88a1d4 Mon Sep 17 00:00:00 2001 From: Kailang Yang <kailang(a)realtek.com> Date: Thu, 21 Sep 2023 15:20:41 +0800 Subject: [PATCH] ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41 AMP This is merge model ALC287_FIXUP_THINKPAD_I2S_SPK and ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI. Signed-off-by: Kailang Yang <kailang(a)realtek.com> Fixes: f7b069cf0881 ("ALSA: hda/realtek: Fix generic fixup definition for cs35l41 amp") Link: https://lore.kernel.org/r/82a45234327c4c50b4988a27e9f64c37@realtek.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 751783f3a15c..48bb57bd8d11 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7343,6 +7343,7 @@ enum { ALC245_FIXUP_HP_MUTE_LED_COEFBIT, ALC245_FIXUP_HP_X360_MUTE_LEDS, ALC287_FIXUP_THINKPAD_I2S_SPK, + ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD, }; /* A special fixup for Lenovo C940 and Yoga Duet 7; @@ -9441,6 +9442,12 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc287_fixup_bind_dacs, }, + [ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc287_fixup_bind_dacs, + .chained = true, + .chain_id = ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -9988,14 +9995,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x22be, "Thinkpad X1 Carbon 8th", ALC285_FIXUP_THINKPAD_HEADSET_JACK), SND_PCI_QUIRK(0x17aa, 0x22c1, "Thinkpad P1 Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK), SND_PCI_QUIRK(0x17aa, 0x22c2, "Thinkpad X1 Extreme Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK), - SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), - SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI), + SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), + SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),

1 year, 3 months

1
0
0 0

[PATCH 5.4] drm: etvnaviv: fix bad backport leading to warning

by Martin Fuzzey

When updating from 5.4.219 -> 5.4.256 I started getting a runtime warning: [ 58.229857] ------------[ cut here ]------------ [ 58.234599] WARNING: CPU: 1 PID: 565 at drivers/gpu/drm/drm_gem.c:1020 drm_gem_object_put+0x90/0x98 [ 58.249935] Modules linked in: qmi_wwan cdc_wdm option usb_wwan smsc95xx rsi_usb rsi_91x btrsi ci_hdrc_imx ci_hdrc [ 58.260499] ueventd: modprobe usb:v2F8Fp7FFFd0200dc00dsc00dp00icFEisc01ip02in00 done [ 58.288877] CPU: 1 PID: 565 Comm: android.display Not tainted 5.4.256pkn-5.4-bsp-snapshot-svn-7423 #2195 [ 58.288883] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) [ 58.288888] Backtrace: [ 58.288912] [<c010e784>] (dump_backtrace) from [<c010eaa4>] (show_stack+0x20/0x24) [ 58.288920] r7:00000000 r6:60010013 r5:00000000 r4:c14cd224 [ 58.328337] [<c010ea84>] (show_stack) from [<c0cf9ca4>] (dump_stack+0xe8/0x120) [ 58.335661] [<c0cf9bbc>] (dump_stack) from [<c012efd0>] (__warn+0xd4/0xe8) [ 58.342542] r10:eda54000 r9:c06ca53c r8:000003fc r7:00000009 r6:c111ed54 r5:00000000 [ 58.350374] r4:00000000 r3:76cf564a [ 58.353957] [<c012eefc>] (__warn) from [<c012f094>] (warn_slowpath_fmt+0xb0/0xc0) [ 58.361445] r9:00000009 r8:c06ca53c r7:000003fc r6:c111ed54 r5:c1406048 r4:00000000 [ 58.369198] [<c012efe8>] (warn_slowpath_fmt) from [<c06ca53c>] (drm_gem_object_put+0x90/0x98) [ 58.377728] r9:edda7e40 r8:edd39360 r7:ad16e000 r6:edda7eb0 r5:00000000 r4:edaa3200 [ 58.385524] [<c06ca4ac>] (drm_gem_object_put) from [<bf0125a8>] (etnaviv_gem_prime_mmap_obj+0x34/0x3c [etnaviv]) [ 58.395704] r5:00000000 r4:edaa3200 [ 58.399334] [<bf012574>] (etnaviv_gem_prime_mmap_obj [etnaviv]) from [<bf0143a0>] (etnaviv_gem_mmap+0x3c/0x60 [etnaviv]) [ 58.410205] r5:edd39360 r4:00000000 [ 58.413816] [<bf014364>] (etnaviv_gem_mmap [etnaviv]) from [<c02c5e08>] (mmap_region+0x37c/0x67c) [ 58.422689] r5:ad16d000 r4:edda7eb8 [ 58.426272] [<c02c5a8c>] (mmap_region) from [<c02c6528>] (do_mmap+0x420/0x544) [ 58.433500] r10:000000fb r9:000fffff r8:ffffffff r7:00000001 r6:00000003 r5:00000001 [ 58.441330] r4:00001000 [ 58.443876] [<c02c6108>] (do_mmap) from [<c02a5b2c>] (vm_mmap_pgoff+0xd0/0x100) [ 58.451190] r10:eda54040 r9:00001000 r8:00000000 r7:00000000 r6:00000003 r5:c1406048 [ 58.459020] r4:edb8ff24 [ 58.461561] [<c02a5a5c>] (vm_mmap_pgoff) from [<c02c3ac8>] (ksys_mmap_pgoff+0xdc/0x10c) [ 58.469570] r10:000000c0 r9:edb8e000 r8:ed650b40 r7:00000003 r6:00001000 r5:00000000 [ 58.477400] r4:00000001 [ 58.479941] [<c02c39ec>] (ksys_mmap_pgoff) from [<c02c3b24>] (sys_mmap_pgoff+0x2c/0x34) [ 58.487949] r8:c0101224 r7:000000c0 r6:951ece38 r5:00010001 r4:00000065 [ 58.494658] [<c02c3af8>] (sys_mmap_pgoff) from [<c0101000>] (ret_fast_syscall+0x0/0x28) It looks like this was a backporting error for the upstream patch 963b2e8c428f "drm/etnaviv: fix reference leak when mmaping imported buffer" In the 5.4 kernel there are 2 variants of the object put function: drm_gem_object_put() [which requires lock to be held] drm_gem_object_put_unlocked() [which requires lock to be NOT held] In later kernels [5.14+] this has gone and there just drm_gem_object_put() which requires lock to be NOT held. So the memory leak pach, which added a call to drm_gem_object_put() was correct on newer kernels but wrong on 5.4 and earlier ones. So switch back to using the _unlocked variant for old kernels. This should only be applied to the 5.4, 4.19 and 4.14 longterm branches; mainline and more recent longterms already have the correct fix. Signed-off-by: Martin Fuzzey <martin.fuzzey(a)flowbird.group> Fixes: 0c6df5364798 "drm/etnaviv: fix reference leak when mmaping imported buffer" [5.4.y] Fixes: 0838cb217a52 "drm/etnaviv: fix reference leak when mmaping imported buffer" [4.19.y] Fixes: 1c9544fbc979 "drm/etnaviv: fix reference leak when mmaping imported buffer" [4.14.y] --- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c index fe7817e4c0d1..4400f578685a 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c @@ -98,7 +98,7 @@ static int etnaviv_gem_prime_mmap_obj(struct etnaviv_gem_object *etnaviv_obj, ret = dma_buf_mmap(etnaviv_obj->base.dma_buf, vma, 0); if (!ret) { /* Drop the reference acquired by drm_gem_mmap_obj(). */ - drm_gem_object_put(&etnaviv_obj->base); + drm_gem_object_put_unlocked(&etnaviv_obj->base); } return ret; -- 2.25.1

1 year, 3 months

3
2
0 0

Linux 6.1.56

by Greg Kroah-Hartman

I'm announcing the release of the 6.1.56 kernel. All users of the 6.1 kernel series must upgrade. The updated 6.1.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/admin-guide/cgroup-v1/memory.rst | 9 Makefile | 2 arch/arm/boot/dts/am335x-guardian.dts | 3 arch/arm/boot/dts/am3517-evm.dts | 2 arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 3 arch/arm/boot/dts/exynos4210-i9100.dts | 4 arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 arch/arm/boot/dts/motorola-mapphone-common.dtsi | 48 - arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 arch/arm/boot/dts/omap3-cm-t3517.dts | 12 arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 3 arch/arm/boot/dts/omap3-gta04.dtsi | 8 arch/arm/boot/dts/omap3-ldp.dts | 2 arch/arm/boot/dts/omap3-n900.dts | 40 - arch/arm/boot/dts/omap3-zoom3.dts | 44 - arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 29 arch/arm/boot/dts/omap4-duovero-parlor.dts | 12 arch/arm/boot/dts/omap4-duovero.dtsi | 18 arch/arm/boot/dts/omap4-kc1.dts | 14 arch/arm/boot/dts/omap4-mcpdm.dtsi | 2 arch/arm/boot/dts/omap4-panda-common.dtsi | 30 arch/arm/boot/dts/omap4-panda-es.dts | 8 arch/arm/boot/dts/omap4-sdp.dts | 36 arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 24 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 6 arch/arm/boot/dts/omap4-var-som-om44.dtsi | 22 arch/arm/boot/dts/omap443x.dtsi | 1 arch/arm/boot/dts/omap4460.dtsi | 1 arch/arm/boot/dts/omap5-cm-t54.dts | 64 - arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 8 arch/arm/boot/dts/twl6030_omap4.dtsi | 4 arch/arm64/boot/dts/freescale/Makefile | 1 arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 9 arch/arm64/configs/defconfig | 1 arch/loongarch/include/asm/elf.h | 9 arch/loongarch/kernel/mem.c | 4 arch/loongarch/kernel/module.c | 2 arch/loongarch/kernel/numa.c | 2 arch/mips/alchemy/devboards/db1000.c | 4 arch/mips/alchemy/devboards/db1200.c | 6 arch/mips/alchemy/devboards/db1300.c | 4 arch/parisc/include/asm/ropes.h | 3 arch/parisc/kernel/drivers.c | 2 arch/parisc/kernel/irq.c | 2 arch/powerpc/kernel/hw_breakpoint.c | 16 arch/powerpc/kernel/hw_breakpoint_constraints.c | 7 arch/powerpc/perf/hv-24x7.c | 2 arch/riscv/include/asm/errata_list.h | 4 arch/x86/include/asm/kexec.h | 2 arch/x86/include/asm/reboot.h | 2 arch/x86/kernel/cpu/bugs.c | 4 arch/x86/kernel/cpu/common.c | 2 arch/x86/kernel/cpu/sgx/encl.c | 30 arch/x86/kernel/crash.c | 31 arch/x86/kernel/reboot.c | 22 arch/x86/kernel/setup.c | 8 arch/x86/kvm/mmu/mmu.c | 8 arch/x86/kvm/mmu/tdp_mmu.c | 31 arch/x86/kvm/mmu/tdp_mmu.h | 3 arch/x86/kvm/svm/sev.c | 34 arch/x86/kvm/svm/svm.c | 9 arch/x86/kvm/svm/svm.h | 1 arch/x86/kvm/vmx/vmx.c | 10 arch/xtensa/boot/Makefile | 3 arch/xtensa/boot/lib/zmem.c | 5 arch/xtensa/include/asm/core.h | 4 arch/xtensa/lib/umulsidi3.S | 4 arch/xtensa/platforms/iss/network.c | 4 drivers/ata/libata-core.c | 41 - drivers/ata/libata-eh.c | 13 drivers/ata/libata-scsi.c | 47 + drivers/ata/libata-transport.c | 9 drivers/ata/libata.h | 2 drivers/ata/sata_mv.c | 4 drivers/bus/ti-sysc.c | 31 drivers/char/agp/parisc-agp.c | 2 drivers/clk/sprd/ums512-clk.c | 2 drivers/clk/tegra/clk-bpmp.c | 2 drivers/firmware/arm_ffa/driver.c | 16 drivers/firmware/arm_scmi/perf.c | 93 +- drivers/firmware/cirrus/cs_dsp.c | 34 drivers/firmware/imx/imx-dsp.c | 1 drivers/gpio/gpio-pmic-eic-sprd.c | 1 drivers/gpio/gpio-tb10x.c | 6 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 3 drivers/gpu/drm/amd/amdgpu/soc21.c | 2 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 4 drivers/gpu/drm/bridge/ti-sn65dsi83.c | 4 drivers/gpu/drm/i915/gt/intel_engine_cs.c | 1 drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 2 drivers/gpu/drm/i915/gt/intel_ggtt.c | 23 drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 drivers/gpu/drm/tests/drm_mm_test.c | 2 drivers/i2c/busses/i2c-i801.c | 1 drivers/i2c/busses/i2c-npcm7xx.c | 17 drivers/i2c/busses/i2c-xiic.c | 2 drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 drivers/i2c/muxes/i2c-mux-gpio.c | 4 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 27 drivers/md/dm-core.h | 1 drivers/md/dm-ioctl.c | 7 drivers/md/dm-table.c | 32 drivers/media/common/videobuf2/frame_vector.c | 6 drivers/media/platform/marvell/Kconfig | 4 drivers/media/platform/via/Kconfig | 2 drivers/media/usb/em28xx/Kconfig | 4 drivers/media/usb/go7007/Kconfig | 2 drivers/media/usb/uvc/uvc_ctrl.c | 3 drivers/misc/cardreader/rts5227.c | 55 - drivers/misc/cardreader/rts5228.c | 57 - drivers/misc/cardreader/rts5249.c | 56 - drivers/misc/cardreader/rts5260.c | 43 - drivers/misc/cardreader/rts5261.c | 52 - drivers/misc/cardreader/rtsx_pcr.c | 51 + drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 drivers/net/ethernet/engleder/tsnep_main.c | 18 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 9 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 13 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 8 drivers/net/ethernet/intel/iavf/iavf.h | 2 drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 drivers/net/ethernet/intel/iavf/iavf_main.c | 17 drivers/net/ethernet/intel/igc/igc_ethtool.c | 31 drivers/net/ethernet/intel/igc/igc_main.c | 2 drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 8 drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 8 drivers/net/ethernet/marvell/octeon_ep/octep_tx.h | 16 drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 19 drivers/net/ethernet/pensando/ionic/ionic_dev.h | 1 drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 10 drivers/net/team/team.c | 10 drivers/net/thunderbolt.c | 3 drivers/net/wireless/ath/ath11k/dp.h | 4 drivers/net/wireless/ath/ath11k/dp_tx.c | 39 drivers/net/wireless/ath/ath11k/dp_tx.h | 1 drivers/nvme/host/fc.c | 2 drivers/nvme/host/pci.c | 121 +-- drivers/parisc/iosapic.c | 4 drivers/parisc/iosapic_private.h | 4 drivers/platform/mellanox/Kconfig | 1 drivers/platform/x86/asus-nb-wmi.c | 9 drivers/platform/x86/intel_scu_ipc.c | 66 + drivers/power/supply/ab8500_btemp.c | 9 drivers/power/supply/ab8500_chargalg.c | 2 drivers/power/supply/mt6370-charger.c | 2 drivers/power/supply/rk817_charger.c | 16 drivers/power/supply/ucs1002_power.c | 3 drivers/s390/crypto/pkey_api.c | 16 drivers/s390/crypto/zcrypt_ep11misc.c | 61 + drivers/s390/crypto/zcrypt_ep11misc.h | 3 drivers/scsi/iscsi_tcp.c | 4 drivers/scsi/pm8001/pm8001_hwi.c | 2 drivers/scsi/pm8001/pm80xx_hwi.c | 4 drivers/scsi/qedf/qedf_io.c | 10 drivers/scsi/qedf/qedf_main.c | 7 drivers/scsi/qla2xxx/qla_def.h | 3 drivers/scsi/qla2xxx/qla_init.c | 5 drivers/scsi/qla2xxx/qla_inline.h | 58 + drivers/scsi/qla2xxx/qla_isr.c | 12 drivers/scsi/qla2xxx/qla_nvme.c | 4 drivers/scsi/qla2xxx/qla_os.c | 6 drivers/scsi/qla2xxx/qla_target.c | 3 drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 drivers/soc/imx/soc-imx8m.c | 10 drivers/spi/spi-gxp.c | 2 drivers/spi/spi-intel-pci.c | 1 drivers/spi/spi-nxp-fspi.c | 7 drivers/spi/spi-stm32.c | 8 drivers/spi/spi-sun6i.c | 31 drivers/thermal/thermal_of.c | 8 drivers/tty/n_gsm.c | 4 drivers/tty/serial/8250/8250_port.c | 5 drivers/ufs/core/ufshcd.c | 13 drivers/vfio/mdev/mdev_sysfs.c | 3 drivers/video/fbdev/Kconfig | 2 fs/binfmt_elf_fdpic.c | 5 fs/btrfs/delayed-inode.c | 85 +- fs/btrfs/extent_io.c | 8 fs/btrfs/super.c | 2 fs/ceph/caps.c | 6 fs/ceph/mds_client.c | 12 fs/ceph/mds_client.h | 11 fs/ceph/quota.c | 14 fs/ceph/snap.c | 10 fs/ceph/super.c | 75 + fs/ceph/super.h | 3 fs/ext4/mballoc.c | 60 - fs/f2fs/data.c | 25 fs/f2fs/dir.c | 34 fs/f2fs/f2fs.h | 5 fs/f2fs/gc.c | 4 fs/netfs/buffered_read.c | 6 fs/nfs/direct.c | 134 ++- fs/nfs/flexfilelayout/flexfilelayout.c | 1 fs/nfs/nfs4client.c | 9 fs/nfs/nfs4proc.c | 10 fs/nfs/write.c | 23 fs/nilfs2/gcinode.c | 6 fs/proc/internal.h | 2 fs/proc/task_nommu.c | 64 - fs/smb/client/cifsglob.h | 1 fs/smb/client/fs_context.c | 1 fs/smb/client/inode.c | 2 fs/smb/client/smb2ops.c | 6 fs/smb/client/transport.c | 34 include/linux/bpf.h | 2 include/linux/btf_ids.h | 2 include/linux/if_team.h | 2 include/linux/interrupt.h | 6 include/linux/libata.h | 4 include/linux/memcontrol.h | 4 include/linux/nfs_fs_sb.h | 1 include/linux/nfs_page.h | 4 include/linux/resume_user_mode.h | 2 include/linux/seqlock.h | 2 include/net/netfilter/nf_tables.h | 127 +-- include/uapi/linux/bpf.h | 4 io_uring/fs.c | 2 kernel/bpf/queue_stack_maps.c | 21 kernel/dma/debug.c | 20 kernel/sched/core.c | 2 kernel/sched/cpupri.c | 1 kernel/sched/idle.c | 1 kernel/trace/bpf_trace.c | 16 kernel/trace/ring_buffer.c | 10 mm/damon/vaddr-test.h | 2 mm/memcontrol.c | 13 mm/slab_common.c | 12 net/bridge/br_forward.c | 4 net/bridge/br_input.c | 4 net/core/flow_dissector.c | 2 net/dccp/ipv4.c | 9 net/dccp/ipv6.c | 9 net/hsr/hsr_framereg.c | 4 net/hsr/hsr_main.h | 2 net/ipv4/route.c | 4 net/mptcp/options.c | 5 net/ncsi/ncsi-aen.c | 5 net/netfilter/ipset/ip_set_core.c | 12 net/netfilter/nf_conntrack_bpf.c | 2 net/netfilter/nf_conntrack_extend.c | 4 net/netfilter/nf_tables_api.c | 400 ++++++++-- net/netfilter/nft_set_hash.c | 87 +- net/netfilter/nft_set_pipapo.c | 69 + net/netfilter/nft_set_rbtree.c | 161 ++-- net/rds/rdma_transport.c | 12 net/smc/smc_stats.h | 3 net/sunrpc/clnt.c | 15 security/smack/smack.h | 1 security/smack/smack_lsm.c | 63 + sound/hda/intel-sdw-acpi.c | 8 sound/pci/hda/hda_intel.c | 1 sound/pci/hda/patch_realtek.c | 3 sound/soc/amd/yc/acp6x-mach.c | 21 sound/soc/codecs/cs42l42.c | 10 sound/soc/codecs/rt5640.c | 13 sound/soc/fsl/imx-audmix.c | 2 sound/soc/fsl/imx-pcm-rpmsg.c | 1 sound/soc/fsl/imx-rpmsg.c | 8 sound/soc/intel/avs/boards/hdaudio.c | 3 sound/soc/meson/axg-spdifin.c | 49 - sound/soc/sof/core.c | 3 sound/soc/sof/intel/mtl.c | 2 sound/soc/sof/intel/mtl.h | 1 tools/include/linux/btf_ids.h | 2 tools/include/linux/mm.h | 2 tools/include/linux/seq_file.h | 2 tools/include/uapi/linux/bpf.h | 4 tools/perf/util/Build | 6 tools/testing/memblock/tests/basic_api.c | 2 tools/testing/memblock/tests/common.h | 1 tools/testing/selftests/ftrace/test.d/instances/instance-event.tc | 2 tools/testing/selftests/kselftest_deps.sh | 77 + tools/testing/selftests/net/tls.c | 8 tools/testing/selftests/powerpc/Makefile | 15 tools/testing/selftests/powerpc/pmu/Makefile | 40 - 282 files changed, 2842 insertions(+), 1575 deletions(-) Adam Ford (1): bus: ti-sysc: Fix missing AM35xx SoC matching Aleksey Nasibulin (1): ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 Alex Deucher (2): drm/amdgpu/soc21: don't remap HDP registers for SR-IOV drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV Amit Pundir (1): arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved Andy Shevchenko (1): serial: 8250_port: Check IRQ data before use Arnaldo Carvalho de Melo (1): perf build: Define YYNOMEM as YYNOABORT for bison < 3.81 Artem Chernyshev (1): net: rds: Fix possible NULL-pointer dereference August Wikerfors (1): ASoC: amd: yc: Fix non-functional mic on Lenovo 82QF and 82UG Ben Wolsieffer (2): proc: nommu: /proc/<pid>/maps: release mmap read lock proc: nommu: fix empty /proc/<pid>/maps Benjamin Gray (5): selftests/powerpc: Use CLEAN macro to fix make warning selftests/powerpc: Pass make context to children powerpc/watchpoints: Disable preemption in thread_change_pc() powerpc/watchpoint: Disable pagefaults when getting user instruction powerpc/watchpoints: Annotate atomic context in more places Chancel Liu (1): ASoC: imx-rpmsg: Set ignore_pmdown_time for dai_link Chao Yu (1): f2fs: optimize iteration over sparse directories Charles Kearney (1): spi: spi-gxp: BUG: Correct spi write return value Chen Ni (1): ASoC: hdaudio.c: Add missing check for devm_kstrdup Chris Morgan (1): power: supply: rk817: Fix node refcount leak Christoph Hellwig (3): MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled nvme-pci: factor the iod mempool creation into a helper nvme-pci: factor out a nvme_pci_alloc_dev helper Christophe JAILLET (3): gpio: tb10x: Fix an error handling path in tb10x_gpio_probe() firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels() ata: sata_mv: Fix incorrect string length computation in mv_dump_mem() Cristian Marussi (1): firmware: arm_scmi: Harden perf domain info access Damien Le Moal (4): ata: libata-scsi: link ata port and scsi device ata: libata-core: Fix ata_port_request_pm() locking ata: libata-core: Fix port and device removal ata: libata-core: Do not register PM operations for SAS ports Dan Carpenter (1): power: supply: ucs1002: fix error code in ucs1002_get_property() Daniel Borkmann (1): bpf: Annotate bpf_long_memcpy with data_race Daniel Scally (1): i2c: xiic: Correct return value check for xiic_reinit() Daniel Starke (1): Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux" Dave Wysochanski (1): netfs: Only call folio_start_fscache() one time for each folio David Christensen (1): ionic: fix 16bit math issue when PAGE_SIZE >= 64KB David Francis (1): drm/amdgpu: Handle null atom context in VBIOS info ioctl David Thompson (1): platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig Eric Dumazet (3): scsi: iscsi_tcp: restrict to TCP sockets dccp: fix dccp_v4_err()/dccp_v6_err() again net: bridge: use DEV_STATS_INC() Filipe Manana (3): btrfs: improve error message after failure to add delayed dir index item btrfs: remove BUG() after failure to insert delayed dir index item btrfs: assert delayed node locked when removing delayed item Florian Westphal (7): netfilter: nf_tables: don't skip expired elements during walk netfilter: nf_tables: don't fail inserts if duplicate has expired netfilter: nf_tables: defer gc run if previous batch is still pending netfilter: nf_tables: fix memleak when more than 255 elements expired netfilter: conntrack: fix extension size table netfilter: nf_tables: disable toggling dormant table state more than once netfilter: nf_tables: fix kdoc warnings after gc rework Frederic Weisbecker (1): timers: Tag (hr)timer softirq as hotplug safe Gerhard Engleder (2): tsnep: Fix NAPI scheduling tsnep: Fix NAPI polling with budget 0 Gleb Chesnokov (1): scsi: qla2xxx: Fix NULL pointer dereference in target mode Greg Kroah-Hartman (1): Linux 6.1.56 Greg Ungerer (1): fs: binfmt_elf_efpic: fix personality for ELF-FDPIC Guangguan Wang (1): net/smc: bugfix for smcr v2 server connect success statistic Haitao Huang (1): x86/sgx: Resolves SECS reclaim vs. page fault for EAUG race Han Xu (1): spi: nxp-fspi: reset the FLSHxCR1 registers Hans Verkuil (1): media: vb2: frame_vector.c: replace WARN_ONCE with a comment Hans de Goede (2): ASoC: rt5640: Revert "Fix sleep in atomic context" ASoC: rt5640: Fix IRQ not being free-ed for HDA jack detect mode Harish Kasiviswanathan (1): drm/amdkfd: Insert missing TLB flush on GFX10 and later Harshit Mogalapalli (1): power: supply: mt6370: Fix missing error code in mt6370_chg_toggle_cfo() Heiner Kallweit (1): i2c: i801: unregister tco_pdev in i801_probe() error path Helge Deller (4): parisc: sba: Fix compile warning wrt list of SBA devices parisc: iosapic.c: Fix sparse warnings parisc: drivers: Fix sparse warning parisc: irq: Make irq_stack_union static to avoid sparse warning Holger Dengler (1): s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_CLR2SECK2 IOCTL Huacai Chen (2): LoongArch: Set all reserved memblocks on Node#0 at initialization LoongArch: numa: Fix high_memory calculation Icenowy Zheng (1): riscv: errata: fix T-Head dcache.cva encoding Ilya Leoshkevich (1): netfilter, bpf: Adjust timeouts of non-confirmed CTs in bpf_ct_insert_entry() Irvin Cote (1): nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev Ivan Vecera (1): i40e: Fix VF VLAN offloading when port VLAN is configured Jaegeuk Kim (1): f2fs: get out of a repeat loop when getting a locked data page Jan Kara (2): ext4: move setting of trimmed bit into ext4_try_to_trim_range() ext4: do not let fstrim block system suspend Jani Nikula (1): drm/meson: fix memory leak on ->hpd_notify callback Janusz Krzysztofik (1): drm/tests: Fix incorrect argument in drm_test_mm_insert_range Javed Hasan (1): scsi: qedf: Add synchronization between I/O completions and abort Javier Pello (1): drm/i915/gt: Fix reservation address in ggtt_reserve_guc_top Jens Axboe (1): io_uring/fs: remove sqe->rw_flags checking from LINKAT Jerome Brunet (1): ASoC: meson: spdifin: start hw on dai probe Jian Shen (1): net: hns3: only enable unicast promisc when mac table full Jie Wang (3): net: hns3: add cmdq check for vf periodic service task net: hns3: fix GRE checksum offload issue net: hns3: add 5ms delay before clear firmware reset irq source Jijie Shao (1): net: hns3: fix fail to delete tc flower rules during reset issue Jinjie Ruan (2): vfio/mdev: Fix a null-ptr-deref bug for mdev_unregister_parent() mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions() Jiri Olsa (2): bpf: Add override check to kprobe multi link attach bpf: Fix BTF_ID symbol generation collision Joel Fernandes (Google) (1): sched/rt: Fix live lock between select_fallback_rq() and RT push Johannes Weiner (1): mm: memcontrol: fix GFP_NOFS recursion in memory.high enforcement Johnathan Mantey (1): ncsi: Propagate carrier gain/loss events to the NCSI controller Josef Bacik (1): btrfs: properly report 0 avail for very full file systems Josh Poimboeuf (2): x86/srso: Fix srso_show_state() side effect x86/srso: Fix SBPB enablement for spec_rstack_overflow=off Jozsef Kadlecsik (1): netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP Julia Lawall (1): thermal/of: add missing of_node_put() Julien Panis (1): bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset() Kailang Yang (1): ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q Kajol Jain (1): powerpc/perf/hv-24x7: Update domain value check Kemeng Shi (1): ext4: replace the traditional ternary conditional operator with with max()/min() Kiwoong Kim (2): scsi: ufs: core: Move __ufshcd_send_uic_cmd() outside host_lock scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command Knyazev Arseniy (1): ALSA: hda/realtek: Splitting the UX3402 into two separate models Krzysztof Kozlowski (4): ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode ARM: dts: omap: correct indentation Kyle Zeng (1): ipv4: fix null-deref in ipv4_link_failure Liam R. Howlett (1): kernel/sched: Modify initial boot task idle setup Liang He (1): i2c: mux: gpio: Add missing fwnode_handle_put() Linus Walleij (1): power: supply: ab8500: Set typing and props Lukasz Majewski (1): net: hsr: Properly parse HSRv1 supervisor frames. Luke D. Jones (1): platform/x86: asus-wmi: Support 2023 ROG X16 tablet mode Marek Vasut (1): drm/bridge: ti-sn65dsi83: Do not generate HFP/HBP/HSA and EOT packet Mario Limonciello (1): ASoC: amd: yc: Fix a non-functional mic on Lenovo 82TL Matthias Schiffer (1): ata: libata-sata: increase PMP SRST timeout to 10s Max Filippov (2): xtensa: add default definition for XCHAL_HAVE_DIV32 xtensa: boot/lib: fix function prototypes Michael Ellerman (1): selftests/powerpc: Fix emit_tests to work with run_kselftest.sh Michal Grzedzicki (2): scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command Michal Hocko (2): memcg: drop kmem.limit_in_bytes mm, memcg: reconsider kmem.limit_in_bytes deprecation Mika Westerberg (2): spi: intel-pci: Add support for Granite Rapids SPI serial flash net: thunderbolt: Fix TCPv6 GSO checksum calculation Mike Rapoport (IBM) (2): memblock tests: fix warning: "__ALIGN_KERNEL" redefined memblock tests: fix warning ‘struct seq_file’ declared inside parameter list Mikko Rapeli (1): arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y Mikulas Patocka (1): dm: fix a race condition in retrieve_deps Muhammad Husaini Zulkifli (1): igc: Expose tx-usecs coalesce setting to user Nathan Rossi (1): soc: imx8m: Enable OCOTP clock for imx8mm before reading registers Nick Desaulniers (1): bpf: Fix BTF_ID symbol generation collision in tools/ Nicolas Frattaroli (1): power: supply: rk817: Add missing module alias Nicolin Chen (1): iommu/arm-smmu-v3: Fix soft lockup triggered by arm_smmu_mm_invalidate_range Nigel Kirkland (1): nvme-fc: Prevent null pointer dereference in nvme_fc_io_getuuid() Niklas Cassel (2): ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset() ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES Nilesh Javali (1): scsi: qla2xxx: Use raw_smp_processor_id() instead of smp_processor_id() Olga Kornievskaia (3): NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server NFSv4.1: fix pnfs MDS=DS session trunking NFSv4.1: fix zero value filehandle in post open getattr Pablo Neira Ayuso (15): netfilter: nf_tables: GC transaction API to avoid race with control plane netfilter: nf_tables: adapt set backend to use GC transaction API netfilter: nft_set_hash: mark set element as dead when deleting from packet path netfilter: nf_tables: remove busy mark and gc batch API netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path netfilter: nf_tables: GC transaction race with netns dismantle netfilter: nf_tables: GC transaction race with abort path netfilter: nf_tables: use correct lock to protect gc_list netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention netfilter: nft_set_pipapo: call nft_trans_gc_queue_sync() in catchall GC netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration netfilter: nf_tables: disallow element removal on anonymous sets netfilter: nf_tables: disallow rule removal from chain binding Pan Bian (1): nilfs2: fix potential use after free in nilfs_gccache_submit_read_data() Paolo Abeni (1): mptcp: fix bogus receive window shrinkage with multiple subflows Paolo Bonzini (2): KVM: SVM: INTERCEPT_RDTSCP is never intercepted anyway KVM: x86/mmu: Do not filter address spaces in for_each_tdp_mmu_root_yield_safe() Paul Cercueil (1): ARM: dts: samsung: exynos4210-i9100: Fix LCD screen's physical size Peter Ujfalusi (2): ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful ALSA: hda: intel-sdw-acpi: Use u8 type for link index Petr Oros (2): iavf: add iavf_schedule_aq_request() helper iavf: schedule a request immediately after add/delete vlan Philip Yang (1): drm/amdkfd: Flush TLB after unmapping for GFX v9.4.3 Pradeep Kumar Chitrapu (1): wifi: ath11k: fix tx status reporting in encap offload mode Pratyush Yadav (1): nvme-pci: do not set the NUMA node of device if it has none Pu Wen (1): x86/srso: Add SRSO mitigation for Hygon processors Qu Wenruo (1): btrfs: reset destination buffer when read_extent_buffer() gets invalid range Quang Le (1): fs/smb/client: Reset password pointer to NULL Radoslaw Tyl (1): iavf: do not process adminq tasks when __IAVF_IN_REMOVE_TASK is set Rafael Aquini (1): mm/slab_common: fix slab_caches list corruption after kmem_cache_destroy() Randy Dunlap (3): xtensa: iss/network: make functions static xtensa: boot: don't add include-dirs xtensa: umulsidi3: fix conditional expression Ranjani Sridharan (1): ASoC: SOF: Intel: MTL: Reduce the DSP init timeout Ricardo B. Marliere (1): selftests: fix dependency checker script Ricardo Ribalda (1): media: uvcvideo: Fix OOB read Richard Fitzgerald (3): ASoC: cs42l42: Ensure a reset pulse meets minimum pulse width. ASoC: cs42l42: Don't rely on GPIOD_OUT_LOW to set RESET initially low firmware: cirrus: cs_dsp: Only log list of algorithms in debug build Ricky WU (1): misc: rtsx: Fix some platforms can not boot and move the l1ss judgment to probe Rik van Riel (1): x86/mm, kexec, ima: Use memblock_free_late() from ima_free_kexec_buffer() Rob Herring (1): arm64: dts: imx: Add imx8mm-prt8mm.dtb to build Roberto Sassu (2): smack: Record transmuting in smk_transmuted smack: Retrieve transmuting information in smack_inode_getsecurity() Sabrina Dubroca (1): selftests: tls: swap the TX and RX sockets in some tests Sakari Ailus (2): media: v4l: Use correct dependency for camera sensor drivers media: via: Use correct dependency for camera sensor drivers Sasha Neftin (1): net/core: Fix ETH_P_1588 flow dissector Sean Christopherson (2): x86/reboot: VMCLEAR active VMCSes before emergency reboot KVM: x86/mmu: Open code leaf invalidation from mmu_notifier Sebastian Andrzej Siewior (5): locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested() net: ena: Flush XDP packets on error. bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI octeontx2-pf: Do xdp_do_flush() after redirects. net: hsr: Add __packed to struct hsr_sup_tlv. Sergey Senozhatsky (1): dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock Shengjiu Wang (2): ASoC: imx-audmix: Fix return error with devm_clk_get() ASoC: fsl: imx-pcm-rpmsg: Add SNDRV_PCM_INFO_BATCH flag Shinas Rasheed (1): octeon_ep: fix tx dma unmap len values in SG Shreyas Deodhar (1): scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called Sibi Sankar (1): firmware: arm_scmi: Fixup perf power-cost/microwatt support Stanislav Fomichev (1): bpf: Clarify error expectations from bpf_clone_redirect Stephen Boyd (4): platform/x86: intel_scu_ipc: Check status after timeout in busy_loop() platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt() platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command() platform/x86: intel_scu_ipc: Fail IPC send if still busy Steve French (1): smb3: correct places where ENOTSUPP is used instead of preferred EOPNOTSUPP Steven Rostedt (Google) (2): ring-buffer: Do not attempt to read past "commit" ring-buffer: Update "shortest_full" in polling Sudeep Holla (1): firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND Sven Eckelmann (2): wifi: ath11k: Cleanup mac80211 references on failure during tx_complete wifi: ath11k: Don't drop tx_status when peer cannot be found Swapnil Patel (1): drm/amd/display: Don't check registers, if using AUX BL control Thomas Zimmermann (1): fbdev/sh7760fb: Depend on FB=y Tiezhu Yang (1): LoongArch: Define relocation types for ABI v2.10 Timo Alho (1): clk: tegra: fix error return case for recalc_rate Tobias Schramm (2): spi: sun6i: reduce DMA RX transfer width to single byte spi: sun6i: fix race between DMA RX transfer completion and RX FIFO drain Toke Høiland-Jørgensen (1): bpf: Avoid deadlock when using queue and stack maps from NMI Tom Lendacky (1): KVM: SVM: Fix TSC_AUX virtualization setup Tony Lindgren (5): ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4 ARM: dts: Unify pwm-omap-dmtimer node names ARM: dts: Unify pinctrl-single pin group nodes for omap4 ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up Trond Myklebust (8): NFS: Fix error handling for O_DIRECT write scheduling NFS: Fix O_DIRECT locking issues NFS: More O_DIRECT accounting fixes for error paths NFS: Use the correct commit info in nfs_join_page_group() NFS: More fixes for nfs_direct_write_reschedule_io() NFS/pNFS: Report EINVAL errors from connect() to the server SUNRPC: Mark the cred for revalidation if the server rejects it Revert "SUNRPC dont update timeout value on connection reset" Umesh Nerlige Ramappa (1): i915/pmu: Move execlist stats initialization to execlist specific setup Valentin Caron (1): spi: stm32: add a delay before SPI disable Vinicius Costa Gomes (1): igc: Fix infinite initialization loop with early XDP redirect Wenhua Lin (1): gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip William A. Kennington III (1): i2c: npcm7xx: Fix callback completion ordering Xiaoke Wang (1): i2c: mux: demux-pinctrl: check the return value of devm_kstrdup() Xiubo Li (1): ceph: drop messages from MDS when unmounting YuBiao Wang (1): drm/amdkfd: Use gpu_offset for user queue's wptr Zhang Xiaoxu (1): cifs: Fix UAF in cifs_demultiplex_thread() Zheng Yejian (2): selftests/ftrace: Correctly enable event in instance-event.tc ring-buffer: Avoid softlockup in ring_buffer_resize() Zhifeng Tang (1): clk: sprd: Fix thm_parents incorrect configuration Ziyang Xuan (1): team: fix null-ptr-deref when team device type is changed

1 year, 3 months

3
3
0 0

[PATCH] net: prevent address rewrite in kernel_bind()

by Jordan Rife

commit c889a99a21bf124c3db08d09df919f0eccc5ea4c upstream. Fix merge conflicts, so this patch can be backported to 4.19+. Similar to the change in commit 0bdf399342c5("net: Avoid address overwrite in kernel_connect"), BPF hooks run on bind may rewrite the address passed to kernel_bind(). This change 1) Makes a copy of the bind address in kernel_bind() to insulate callers. 2) Replaces direct calls to sock->ops->bind() in net with kernel_bind() Link: https://lore.kernel.org/netdev/20230912013332.2048422-1-jrife@google.com/ Fixes: 4fbac77d2d09 ("bpf: Hooks for sys_bind") Cc: stable(a)vger.kernel.org Reviewed-by: Willem de Bruijn <willemb(a)google.com> Signed-off-by: Jordan Rife <jrife(a)google.com> Reviewed-by: Simon Horman <horms(a)kernel.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> --- net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- net/rds/tcp_connect.c | 2 +- net/rds/tcp_listen.c | 2 +- net/socket.c | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index 264f2f87a4376..bc7b71c9d28ab 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -1441,7 +1441,7 @@ static int bind_mcastif_addr(struct socket *sock, struct net_device *dev) sin.sin_addr.s_addr = addr; sin.sin_port = 0; - return sock->ops->bind(sock, (struct sockaddr*)&sin, sizeof(sin)); + return kernel_bind(sock, (struct sockaddr *)&sin, sizeof(sin)); } static void get_mcast_sockaddr(union ipvs_sockaddr *sa, int *salen, @@ -1548,7 +1548,7 @@ static int make_receive_sock(struct netns_ipvs *ipvs, int id, get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->bcfg, id); sock->sk->sk_bound_dev_if = dev->ifindex; - result = sock->ops->bind(sock, (struct sockaddr *)&mcast_addr, salen); + result = kernel_bind(sock, (struct sockaddr *)&mcast_addr, salen); if (result < 0) { pr_err("Error binding to the multicast addr\n"); goto error; diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c index f0c477c5d1db4..5cf227472272e 100644 --- a/net/rds/tcp_connect.c +++ b/net/rds/tcp_connect.c @@ -145,7 +145,7 @@ int rds_tcp_conn_path_connect(struct rds_conn_path *cp) addrlen = sizeof(sin); } - ret = sock->ops->bind(sock, addr, addrlen); + ret = kernel_bind(sock, addr, addrlen); if (ret) { rdsdebug("bind failed with %d at address %pI6c\n", ret, &conn->c_laddr); diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c index 014fa24418c12..53b3535a1e4a8 100644 --- a/net/rds/tcp_listen.c +++ b/net/rds/tcp_listen.c @@ -306,7 +306,7 @@ struct socket *rds_tcp_listen_init(struct net *net, bool isv6) addr_len = sizeof(*sin); } - ret = sock->ops->bind(sock, (struct sockaddr *)&ss, addr_len); + ret = kernel_bind(sock, (struct sockaddr *)&ss, addr_len); if (ret < 0) { rdsdebug("could not bind %s listener socket: %d\n", isv6 ? "IPv6" : "IPv4", ret); diff --git a/net/socket.c b/net/socket.c index b5639a6500158..9bbc061688d28 100644 --- a/net/socket.c +++ b/net/socket.c @@ -3450,7 +3450,11 @@ static long compat_sock_ioctl(struct file *file, unsigned int cmd, int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen) { - return sock->ops->bind(sock, addr, addrlen); + struct sockaddr_storage address; + + memcpy(&address, addr, addrlen); + + return sock->ops->bind(sock, (struct sockaddr *)&address, addrlen); } EXPORT_SYMBOL(kernel_bind); -- 2.42.0.609.gbb76f46606-goog

1 year, 3 months

2
1
0 0

Linux 5.10.y / ipc: replace costly bailout check in sysvipc_find_ipc()

by Marek Vasut

Please backport to Linux 5.10.y : 20401d1058f3f841f35a594ac2fc1293710e55b9 ipc: replace costly bailout check in sysvipc_find_ipc() This should address CVE-2021-3669 https://nvd.nist.gov/vuln/detail/CVE-2021-3669 Thank you

1 year, 3 months

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2023