From: Greg Kroah-Hartman Date: Sat, 13 Aug 2022 09:47:34 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.15.61~190 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2eee41f3d242b21bbda643b02691f67e4a8cac5d;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: alsa-hda-cirrus-support-for-imac-12-1-model.patch alsa-hda-conexant-add-quirk-for-lenovo-20149-notebook-model.patch alsa-hda-realtek-add-quirk-for-another-asus-k42jz-model.patch fbcon-fix-boundary-checks-for-fbcon-vc-n1-n2-parameters.patch fs-add-missing-umask-strip-in-vfs_tmpfile.patch mm-mremap-hold-the-rmap-lock-in-write-mode-when-moving-page-table-entries.patch ovl-drop-warn_on-dentry-is-null-in-ovl_encode_fh.patch thermal-sysfs-fix-cooling_device_stats_setup-error-code-path.patch tty-vt-initialize-unicode-screen-buffer.patch usbnet-fix-linkwatch-use-after-free-on-disconnect.patch vfs-check-the-truncate-maximum-size-in-inode_newsize_ok.patch --- diff --git a/queue-5.4/alsa-hda-cirrus-support-for-imac-12-1-model.patch b/queue-5.4/alsa-hda-cirrus-support-for-imac-12-1-model.patch new file mode 100644 index 00000000000..4c7b63768f8 --- /dev/null +++ b/queue-5.4/alsa-hda-cirrus-support-for-imac-12-1-model.patch @@ -0,0 +1,34 @@ +From 74bba640d69914cf832b87f6bbb700e5ba430672 Mon Sep 17 00:00:00 2001 +From: Allen Ballway +Date: Wed, 10 Aug 2022 15:27:22 +0000 +Subject: ALSA: hda/cirrus - support for iMac 12,1 model + +From: Allen Ballway + +commit 74bba640d69914cf832b87f6bbb700e5ba430672 upstream. + +The 12,1 model requires the same configuration as the 12,2 model +to enable headphones but has a different codec SSID. Adds +12,1 SSID for matching quirk. + +[ re-sorted in SSID order by tiwai ] + +Signed-off-by: Allen Ballway +Cc: +Link: https://lore.kernel.org/r/20220810152701.1.I902c2e591bbf8de9acb649d1322fa1f291849266@changeid +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_cirrus.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_cirrus.c ++++ b/sound/pci/hda/patch_cirrus.c +@@ -396,6 +396,7 @@ static const struct snd_pci_quirk cs420x + + /* codec SSID */ + SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122), ++ SND_PCI_QUIRK(0x106b, 0x0900, "iMac 12,1", CS420X_IMAC27_122), + SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81), + SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122), + SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101), diff --git a/queue-5.4/alsa-hda-conexant-add-quirk-for-lenovo-20149-notebook-model.patch b/queue-5.4/alsa-hda-conexant-add-quirk-for-lenovo-20149-notebook-model.patch new file mode 100644 index 00000000000..4830296ab4f --- /dev/null +++ b/queue-5.4/alsa-hda-conexant-add-quirk-for-lenovo-20149-notebook-model.patch @@ -0,0 +1,57 @@ +From f83bb2592482fe94c6eea07a8121763c80f36ce5 Mon Sep 17 00:00:00 2001 +From: Meng Tang +Date: Mon, 8 Aug 2022 15:34:06 +0800 +Subject: ALSA: hda/conexant: Add quirk for LENOVO 20149 Notebook model + +From: Meng Tang + +commit f83bb2592482fe94c6eea07a8121763c80f36ce5 upstream. + +There is another LENOVO 20149 (Type1Sku0) Notebook model with +CX20590, the device PCI SSID is 17aa:3977, which headphones are +not responding, that requires the quirk CXT_PINCFG_LENOVO_NOTEBOOK. +Add the corresponding entry to the quirk table. + +Signed-off-by: Meng Tang +Cc: +Link: https://lore.kernel.org/r/20220808073406.19460-1-tangmeng@uniontech.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_conexant.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_conexant.c ++++ b/sound/pci/hda/patch_conexant.c +@@ -197,6 +197,7 @@ enum { + CXT_PINCFG_LEMOTE_A1205, + CXT_PINCFG_COMPAQ_CQ60, + CXT_FIXUP_STEREO_DMIC, ++ CXT_PINCFG_LENOVO_NOTEBOOK, + CXT_FIXUP_INC_MIC_BOOST, + CXT_FIXUP_HEADPHONE_MIC_PIN, + CXT_FIXUP_HEADPHONE_MIC, +@@ -737,6 +738,14 @@ static const struct hda_fixup cxt_fixups + .type = HDA_FIXUP_FUNC, + .v.func = cxt_fixup_stereo_dmic, + }, ++ [CXT_PINCFG_LENOVO_NOTEBOOK] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ { 0x1a, 0x05d71030 }, ++ { } ++ }, ++ .chain_id = CXT_FIXUP_STEREO_DMIC, ++ }, + [CXT_FIXUP_INC_MIC_BOOST] = { + .type = HDA_FIXUP_FUNC, + .v.func = cxt5066_increase_mic_boost, +@@ -930,7 +939,7 @@ static const struct snd_pci_quirk cxt506 + SND_PCI_QUIRK(0x17aa, 0x3905, "Lenovo G50-30", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), +- SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC), ++ SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_PINCFG_LENOVO_NOTEBOOK), + SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI), diff --git a/queue-5.4/alsa-hda-realtek-add-quirk-for-another-asus-k42jz-model.patch b/queue-5.4/alsa-hda-realtek-add-quirk-for-another-asus-k42jz-model.patch new file mode 100644 index 00000000000..4c94647d2eb --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-add-quirk-for-another-asus-k42jz-model.patch @@ -0,0 +1,56 @@ +From f882c4bef9cb914d9f7be171afb10ed26536bfa7 Mon Sep 17 00:00:00 2001 +From: Meng Tang +Date: Fri, 5 Aug 2022 15:45:34 +0800 +Subject: ALSA: hda/realtek: Add quirk for another Asus K42JZ model + +From: Meng Tang + +commit f882c4bef9cb914d9f7be171afb10ed26536bfa7 upstream. + +There is another Asus K42JZ model with the PCI SSID 1043:1313 +that requires the quirk ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE. +Add the corresponding entry to the quirk table. + +Signed-off-by: Meng Tang +Cc: +Link: https://lore.kernel.org/r/20220805074534.20003-1-tangmeng@uniontech.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6370,6 +6370,7 @@ enum { + ALC269_FIXUP_LIMIT_INT_MIC_BOOST, + ALC269VB_FIXUP_ASUS_ZENBOOK, + ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A, ++ ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE, + ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED, + ALC269VB_FIXUP_ORDISSIMO_EVE2, + ALC283_FIXUP_CHROME_BOOK, +@@ -6901,6 +6902,15 @@ static const struct hda_fixup alc269_fix + .chained = true, + .chain_id = ALC269VB_FIXUP_ASUS_ZENBOOK, + }, ++ [ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ { 0x18, 0x01a110f0 }, /* use as headset mic */ ++ { } ++ }, ++ .chained = true, ++ .chain_id = ALC269_FIXUP_HEADSET_MIC ++ }, + [ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc269_fixup_limit_int_mic_boost, +@@ -8215,6 +8225,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC), ++ SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), + SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), diff --git a/queue-5.4/fbcon-fix-boundary-checks-for-fbcon-vc-n1-n2-parameters.patch b/queue-5.4/fbcon-fix-boundary-checks-for-fbcon-vc-n1-n2-parameters.patch new file mode 100644 index 00000000000..1195aeb43d5 --- /dev/null +++ b/queue-5.4/fbcon-fix-boundary-checks-for-fbcon-vc-n1-n2-parameters.patch @@ -0,0 +1,54 @@ +From cad564ca557f8d3bb3b1fa965d9a2b3f6490ec69 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Thu, 2 Jun 2022 22:06:28 +0200 +Subject: fbcon: Fix boundary checks for fbcon=vc:n1-n2 parameters + +From: Helge Deller + +commit cad564ca557f8d3bb3b1fa965d9a2b3f6490ec69 upstream. + +The user may use the fbcon=vc:- option to tell fbcon to take +over the given range (n1...n2) of consoles. The value for n1 and n2 +needs to be a positive number and up to (MAX_NR_CONSOLES - 1). +The given values were not fully checked against those boundaries yet. + +To fix the issue, convert first_fb_vc and last_fb_vc to unsigned +integers and check them against the upper boundary, and make sure that +first_fb_vc is smaller than last_fb_vc. + +Cc: stable@vger.kernel.org # v4.19+ +Reviewed-by: Daniel Vetter +Signed-off-by: Helge Deller +Link: https://patchwork.freedesktop.org/patch/msgid/YpkYRMojilrtZIgM@p100 +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/fbdev/core/fbcon.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/drivers/video/fbdev/core/fbcon.c ++++ b/drivers/video/fbdev/core/fbcon.c +@@ -123,8 +123,8 @@ static int logo_lines; + enums. */ + static int logo_shown = FBCON_LOGO_CANSHOW; + /* console mappings */ +-static int first_fb_vc; +-static int last_fb_vc = MAX_NR_CONSOLES - 1; ++static unsigned int first_fb_vc; ++static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1; + static int fbcon_is_default = 1; + static int primary_device = -1; + static int fbcon_has_console_bind; +@@ -474,10 +474,12 @@ static int __init fb_console_setup(char + options += 3; + if (*options) + first_fb_vc = simple_strtoul(options, &options, 10) - 1; +- if (first_fb_vc < 0) ++ if (first_fb_vc >= MAX_NR_CONSOLES) + first_fb_vc = 0; + if (*options++ == '-') + last_fb_vc = simple_strtoul(options, &options, 10) - 1; ++ if (last_fb_vc < first_fb_vc || last_fb_vc >= MAX_NR_CONSOLES) ++ last_fb_vc = MAX_NR_CONSOLES - 1; + fbcon_is_default = 0; + continue; + } diff --git a/queue-5.4/fs-add-missing-umask-strip-in-vfs_tmpfile.patch b/queue-5.4/fs-add-missing-umask-strip-in-vfs_tmpfile.patch new file mode 100644 index 00000000000..5b756f1a581 --- /dev/null +++ b/queue-5.4/fs-add-missing-umask-strip-in-vfs_tmpfile.patch @@ -0,0 +1,40 @@ +From ac6800e279a22b28f4fc21439843025a0d5bf03e Mon Sep 17 00:00:00 2001 +From: Yang Xu +Date: Thu, 14 Jul 2022 14:11:26 +0800 +Subject: fs: Add missing umask strip in vfs_tmpfile + +From: Yang Xu + +commit ac6800e279a22b28f4fc21439843025a0d5bf03e upstream. + +All creation paths except for O_TMPFILE handle umask in the vfs directly +if the filesystem doesn't support or enable POSIX ACLs. If the filesystem +does then umask handling is deferred until posix_acl_create(). +Because, O_TMPFILE misses umask handling in the vfs it will not honor +umask settings. Fix this by adding the missing umask handling. + +Link: https://lore.kernel.org/r/1657779088-2242-2-git-send-email-xuyang2018.jy@fujitsu.com +Fixes: 60545d0d4610 ("[O_TMPFILE] it's still short a few helpers, but infrastructure should be OK now...") +Cc: # 4.19+ +Reported-by: Christian Brauner (Microsoft) +Reviewed-by: Darrick J. Wong +Reviewed-and-Tested-by: Jeff Layton +Acked-by: Christian Brauner (Microsoft) +Signed-off-by: Yang Xu +Signed-off-by: Christian Brauner (Microsoft) +Signed-off-by: Greg Kroah-Hartman +--- + fs/namei.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -3443,6 +3443,8 @@ struct dentry *vfs_tmpfile(struct dentry + child = d_alloc(dentry, &slash_name); + if (unlikely(!child)) + goto out_err; ++ if (!IS_POSIXACL(dir)) ++ mode &= ~current_umask(); + error = dir->i_op->tmpfile(dir, child, mode); + if (error) + goto out_err; diff --git a/queue-5.4/mm-mremap-hold-the-rmap-lock-in-write-mode-when-moving-page-table-entries.patch b/queue-5.4/mm-mremap-hold-the-rmap-lock-in-write-mode-when-moving-page-table-entries.patch new file mode 100644 index 00000000000..f9c76490eb2 --- /dev/null +++ b/queue-5.4/mm-mremap-hold-the-rmap-lock-in-write-mode-when-moving-page-table-entries.patch @@ -0,0 +1,96 @@ +From 97113eb39fa7972722ff490b947d8af023e1f6a2 Mon Sep 17 00:00:00 2001 +From: "Aneesh Kumar K.V" +Date: Wed, 7 Jul 2021 18:10:15 -0700 +Subject: mm/mremap: hold the rmap lock in write mode when moving page table entries. + +From: Aneesh Kumar K.V + +commit 97113eb39fa7972722ff490b947d8af023e1f6a2 upstream. + +To avoid a race between rmap walk and mremap, mremap does +take_rmap_locks(). The lock was taken to ensure that rmap walk don't miss +a page table entry due to PTE moves via move_pagetables(). The kernel +does further optimization of this lock such that if we are going to find +the newly added vma after the old vma, the rmap lock is not taken. This +is because rmap walk would find the vmas in the same order and if we don't +find the page table attached to older vma we would find it with the new +vma which we would iterate later. + +As explained in commit eb66ae030829 ("mremap: properly flush TLB before +releasing the page") mremap is special in that it doesn't take ownership +of the page. The optimized version for PUD/PMD aligned mremap also +doesn't hold the ptl lock. This can result in stale TLB entries as show +below. + +This patch updates the rmap locking requirement in mremap to handle the race condition +explained below with optimized mremap:: + +Optmized PMD move + + CPU 1 CPU 2 CPU 3 + + mremap(old_addr, new_addr) page_shrinker/try_to_unmap_one + + mmap_write_lock_killable() + + addr = old_addr + lock(pte_ptl) + lock(pmd_ptl) + pmd = *old_pmd + pmd_clear(old_pmd) + flush_tlb_range(old_addr) + + *new_pmd = pmd + *new_addr = 10; and fills + TLB with new addr + and old pfn + + unlock(pmd_ptl) + ptep_clear_flush() + old pfn is free. + Stale TLB entry + +Optimized PUD move also suffers from a similar race. Both the above race +condition can be fixed if we force mremap path to take rmap lock. + +Link: https://lkml.kernel.org/r/20210616045239.370802-7-aneesh.kumar@linux.ibm.com +Fixes: 2c91bd4a4e2e ("mm: speed up mremap by 20x on large regions") +Fixes: c49dd3401802 ("mm: speedup mremap on 1GB or larger regions") +Link: https://lore.kernel.org/linux-mm/CAHk-=wgXVR04eBNtxQfevontWnP6FDm+oj5vauQXP3S-huwbPw@mail.gmail.com +Signed-off-by: Aneesh Kumar K.V +Acked-by: Hugh Dickins +Acked-by: Kirill A. Shutemov +Cc: Christophe Leroy +Cc: Joel Fernandes +Cc: Kalesh Singh +Cc: Kirill A. Shutemov +Cc: Michael Ellerman +Cc: Nicholas Piggin +Cc: Stephen Rothwell +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +[patch rewritten for backport since the code was refactored since] +Signed-off-by: Jann Horn +Signed-off-by: Greg Kroah-Hartman +--- + mm/mremap.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- a/mm/mremap.c ++++ b/mm/mremap.c +@@ -293,12 +293,10 @@ unsigned long move_page_tables(struct vm + */ + bool moved; + +- if (need_rmap_locks) +- take_rmap_locks(vma); ++ take_rmap_locks(vma); + moved = move_normal_pmd(vma, old_addr, new_addr, + old_end, old_pmd, new_pmd); +- if (need_rmap_locks) +- drop_rmap_locks(vma); ++ drop_rmap_locks(vma); + if (moved) + continue; + #endif diff --git a/queue-5.4/ovl-drop-warn_on-dentry-is-null-in-ovl_encode_fh.patch b/queue-5.4/ovl-drop-warn_on-dentry-is-null-in-ovl_encode_fh.patch new file mode 100644 index 00000000000..2a57da54b1a --- /dev/null +++ b/queue-5.4/ovl-drop-warn_on-dentry-is-null-in-ovl_encode_fh.patch @@ -0,0 +1,57 @@ +From dd524b7f317de8d31d638cbfdc7be4cf9b770e42 Mon Sep 17 00:00:00 2001 +From: Jiachen Zhang +Date: Thu, 28 Jul 2022 19:49:15 +0800 +Subject: ovl: drop WARN_ON() dentry is NULL in ovl_encode_fh() + +From: Jiachen Zhang + +commit dd524b7f317de8d31d638cbfdc7be4cf9b770e42 upstream. + +Some code paths cannot guarantee the inode have any dentry alias. So +WARN_ON() all !dentry may flood the kernel logs. + +For example, when an overlayfs inode is watched by inotifywait (1), and +someone is trying to read the /proc/$(pidof inotifywait)/fdinfo/INOTIFY_FD, +at that time if the dentry has been reclaimed by kernel (such as +echo 2 > /proc/sys/vm/drop_caches), there will be a WARN_ON(). The +printed call stack would be like: + + ? show_mark_fhandle+0xf0/0xf0 + show_mark_fhandle+0x4a/0xf0 + ? show_mark_fhandle+0xf0/0xf0 + ? seq_vprintf+0x30/0x50 + ? seq_printf+0x53/0x70 + ? show_mark_fhandle+0xf0/0xf0 + inotify_fdinfo+0x70/0x90 + show_fdinfo.isra.4+0x53/0x70 + seq_show+0x130/0x170 + seq_read+0x153/0x440 + vfs_read+0x94/0x150 + ksys_read+0x5f/0xe0 + do_syscall_64+0x59/0x1e0 + entry_SYSCALL_64_after_hwframe+0x44/0xa9 + +So let's drop WARN_ON() to avoid kernel log flooding. + +Reported-by: Hongbo Yin +Signed-off-by: Jiachen Zhang +Signed-off-by: Tianci Zhang +Fixes: 8ed5eec9d6c4 ("ovl: encode pure upper file handles") +Cc: # v4.16 +Signed-off-by: Miklos Szeredi +Signed-off-by: Greg Kroah-Hartman +--- + fs/overlayfs/export.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/overlayfs/export.c ++++ b/fs/overlayfs/export.c +@@ -274,7 +274,7 @@ static int ovl_encode_fh(struct inode *i + return FILEID_INVALID; + + dentry = d_find_any_alias(inode); +- if (WARN_ON(!dentry)) ++ if (!dentry) + return FILEID_INVALID; + + type = ovl_dentry_to_fh(dentry, fid, max_len); diff --git a/queue-5.4/series b/queue-5.4/series index 9cc74ff5b5f..25655045e20 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -15,3 +15,14 @@ kvm-svm-don-t-bug-if-userspace-injects-an-interrupt-with-gif-0.patch kvm-nvmx-let-userspace-set-nvmx-msr-to-any-_host_-supported-value.patch kvm-x86-mark-tss-busy-during-ltr-emulation-_after_-all-fault-checks.patch kvm-x86-set-error-code-to-segment-selector-on-lldt-ltr-non-canonical-gp.patch +mm-mremap-hold-the-rmap-lock-in-write-mode-when-moving-page-table-entries.patch +alsa-hda-conexant-add-quirk-for-lenovo-20149-notebook-model.patch +alsa-hda-cirrus-support-for-imac-12-1-model.patch +alsa-hda-realtek-add-quirk-for-another-asus-k42jz-model.patch +tty-vt-initialize-unicode-screen-buffer.patch +vfs-check-the-truncate-maximum-size-in-inode_newsize_ok.patch +fs-add-missing-umask-strip-in-vfs_tmpfile.patch +thermal-sysfs-fix-cooling_device_stats_setup-error-code-path.patch +fbcon-fix-boundary-checks-for-fbcon-vc-n1-n2-parameters.patch +usbnet-fix-linkwatch-use-after-free-on-disconnect.patch +ovl-drop-warn_on-dentry-is-null-in-ovl_encode_fh.patch diff --git a/queue-5.4/thermal-sysfs-fix-cooling_device_stats_setup-error-code-path.patch b/queue-5.4/thermal-sysfs-fix-cooling_device_stats_setup-error-code-path.patch new file mode 100644 index 00000000000..ea35f7ef3ea --- /dev/null +++ b/queue-5.4/thermal-sysfs-fix-cooling_device_stats_setup-error-code-path.patch @@ -0,0 +1,69 @@ +From d5a8aa5d7d80d21ab6b266f1bed4194b61746199 Mon Sep 17 00:00:00 2001 +From: "Rafael J. Wysocki" +Date: Fri, 29 Jul 2022 17:39:07 +0200 +Subject: thermal: sysfs: Fix cooling_device_stats_setup() error code path + +From: Rafael J. Wysocki + +commit d5a8aa5d7d80d21ab6b266f1bed4194b61746199 upstream. + +If cooling_device_stats_setup() fails to create the stats object, it +must clear the last slot in cooling_device_attr_groups that was +initially empty (so as to make it possible to add stats attributes to +the cooling device attribute groups). + +Failing to do so may cause the stats attributes to be created by +mistake for a device that doesn't have a stats object, because the +slot in question might be populated previously during the registration +of another cooling device. + +Fixes: 8ea229511e06 ("thermal: Add cooling device's statistics in sysfs") +Reported-by: Di Shen +Tested-by: Di Shen +Cc: 4.17+ # 4.17+ +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman +--- + drivers/thermal/thermal_sysfs.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/drivers/thermal/thermal_sysfs.c ++++ b/drivers/thermal/thermal_sysfs.c +@@ -909,12 +909,13 @@ static const struct attribute_group cool + + static void cooling_device_stats_setup(struct thermal_cooling_device *cdev) + { ++ const struct attribute_group *stats_attr_group = NULL; + struct cooling_dev_stats *stats; + unsigned long states; + int var; + + if (cdev->ops->get_max_state(cdev, &states)) +- return; ++ goto out; + + states++; /* Total number of states is highest state + 1 */ + +@@ -924,7 +925,7 @@ static void cooling_device_stats_setup(s + + stats = kzalloc(var, GFP_KERNEL); + if (!stats) +- return; ++ goto out; + + stats->time_in_state = (ktime_t *)(stats + 1); + stats->trans_table = (unsigned int *)(stats->time_in_state + states); +@@ -934,9 +935,12 @@ static void cooling_device_stats_setup(s + + spin_lock_init(&stats->lock); + ++ stats_attr_group = &cooling_device_stats_attr_group; ++ ++out: + /* Fill the empty slot left in cooling_device_attr_groups */ + var = ARRAY_SIZE(cooling_device_attr_groups) - 2; +- cooling_device_attr_groups[var] = &cooling_device_stats_attr_group; ++ cooling_device_attr_groups[var] = stats_attr_group; + } + + static void cooling_device_stats_destroy(struct thermal_cooling_device *cdev) diff --git a/queue-5.4/tty-vt-initialize-unicode-screen-buffer.patch b/queue-5.4/tty-vt-initialize-unicode-screen-buffer.patch new file mode 100644 index 00000000000..686ec7dd96c --- /dev/null +++ b/queue-5.4/tty-vt-initialize-unicode-screen-buffer.patch @@ -0,0 +1,51 @@ +From af77c56aa35325daa2bc2bed5c2ebf169be61b86 Mon Sep 17 00:00:00 2001 +From: Tetsuo Handa +Date: Tue, 19 Jul 2022 14:49:39 +0900 +Subject: tty: vt: initialize unicode screen buffer + +From: Tetsuo Handa + +commit af77c56aa35325daa2bc2bed5c2ebf169be61b86 upstream. + +syzbot reports kernel infoleak at vcs_read() [1], for buffer can be read +immediately after resize operation. Initialize buffer using kzalloc(). + + ---------- + #include + #include + #include + #include + + int main(int argc, char *argv[]) + { + struct fb_var_screeninfo var = { }; + const int fb_fd = open("/dev/fb0", 3); + ioctl(fb_fd, FBIOGET_VSCREENINFO, &var); + var.yres = 0x21; + ioctl(fb_fd, FBIOPUT_VSCREENINFO, &var); + return read(open("/dev/vcsu", O_RDONLY), &var, sizeof(var)) == -1; + } + ---------- + +Link: https://syzkaller.appspot.com/bug?extid=31a641689d43387f05d3 [1] +Cc: stable +Reported-by: syzbot +Reviewed-by: Jiri Slaby +Signed-off-by: Tetsuo Handa +Link: https://lore.kernel.org/r/4ef053cf-e796-fb5e-58b7-3ae58242a4ad@I-love.SAKURA.ne.jp +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/vt/vt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/tty/vt/vt.c ++++ b/drivers/tty/vt/vt.c +@@ -351,7 +351,7 @@ static struct uni_screen *vc_uniscr_allo + /* allocate everything in one go */ + memsize = cols * rows * sizeof(char32_t); + memsize += rows * sizeof(char32_t *); +- p = vmalloc(memsize); ++ p = vzalloc(memsize); + if (!p) + return NULL; + diff --git a/queue-5.4/usbnet-fix-linkwatch-use-after-free-on-disconnect.patch b/queue-5.4/usbnet-fix-linkwatch-use-after-free-on-disconnect.patch new file mode 100644 index 00000000000..e23fdee71bd --- /dev/null +++ b/queue-5.4/usbnet-fix-linkwatch-use-after-free-on-disconnect.patch @@ -0,0 +1,85 @@ +From a69e617e533edddf3fa3123149900f36e0a6dc74 Mon Sep 17 00:00:00 2001 +From: Lukas Wunner +Date: Thu, 23 Jun 2022 14:50:59 +0200 +Subject: usbnet: Fix linkwatch use-after-free on disconnect + +From: Lukas Wunner + +commit a69e617e533edddf3fa3123149900f36e0a6dc74 upstream. + +usbnet uses the work usbnet_deferred_kevent() to perform tasks which may +sleep. On disconnect, completion of the work was originally awaited in +->ndo_stop(). But in 2003, that was moved to ->disconnect() by historic +commit "[PATCH] USB: usbnet, prevent exotic rtnl deadlock": + + https://git.kernel.org/tglx/history/c/0f138bbfd83c + +The change was made because back then, the kernel's workqueue +implementation did not allow waiting for a single work. One had to wait +for completion of *all* work by calling flush_scheduled_work(), and that +could deadlock when waiting for usbnet_deferred_kevent() with rtnl_mutex +held in ->ndo_stop(). + +The commit solved one problem but created another: It causes a +use-after-free in USB Ethernet drivers aqc111.c, asix_devices.c, +ax88179_178a.c, ch9200.c and smsc75xx.c: + +* If the drivers receive a link change interrupt immediately before + disconnect, they raise EVENT_LINK_RESET in their (non-sleepable) + ->status() callback and schedule usbnet_deferred_kevent(). +* usbnet_deferred_kevent() invokes the driver's ->link_reset() callback, + which calls netif_carrier_{on,off}(). +* That in turn schedules the work linkwatch_event(). + +Because usbnet_deferred_kevent() is awaited after unregister_netdev(), +netif_carrier_{on,off}() may operate on an unregistered netdev and +linkwatch_event() may run after free_netdev(), causing a use-after-free. + +In 2010, usbnet was changed to only wait for a single instance of +usbnet_deferred_kevent() instead of *all* work by commit 23f333a2bfaf +("drivers/net: don't use flush_scheduled_work()"). + +Unfortunately the commit neglected to move the wait back to +->ndo_stop(). Rectify that omission at long last. + +Reported-by: Jann Horn +Link: https://lore.kernel.org/netdev/CAG48ez0MHBbENX5gCdHAUXZ7h7s20LnepBF-pa5M=7Bi-jZrEA@mail.gmail.com/ +Reported-by: Oleksij Rempel +Link: https://lore.kernel.org/netdev/20220315113841.GA22337@pengutronix.de/ +Signed-off-by: Lukas Wunner +Cc: stable@vger.kernel.org +Acked-by: Oliver Neukum +Link: https://lore.kernel.org/r/d1c87ebe9fc502bffcd1576e238d685ad08321e4.1655987888.git.lukas@wunner.de +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/usbnet.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -833,13 +833,11 @@ int usbnet_stop (struct net_device *net) + + mpn = !test_and_clear_bit(EVENT_NO_RUNTIME_PM, &dev->flags); + +- /* deferred work (task, timer, softirq) must also stop. +- * can't flush_scheduled_work() until we drop rtnl (later), +- * else workers could deadlock; so make workers a NOP. +- */ ++ /* deferred work (timer, softirq, task) must also stop */ + dev->flags = 0; + del_timer_sync (&dev->delay); + tasklet_kill (&dev->bh); ++ cancel_work_sync(&dev->kevent); + if (!pm) + usb_autopm_put_interface(dev->intf); + +@@ -1603,8 +1601,6 @@ void usbnet_disconnect (struct usb_inter + net = dev->net; + unregister_netdev (net); + +- cancel_work_sync(&dev->kevent); +- + usb_scuttle_anchored_urbs(&dev->deferred); + + if (dev->driver_info->unbind) diff --git a/queue-5.4/vfs-check-the-truncate-maximum-size-in-inode_newsize_ok.patch b/queue-5.4/vfs-check-the-truncate-maximum-size-in-inode_newsize_ok.patch new file mode 100644 index 00000000000..9ceb9030b9f --- /dev/null +++ b/queue-5.4/vfs-check-the-truncate-maximum-size-in-inode_newsize_ok.patch @@ -0,0 +1,68 @@ +From e2ebff9c57fe4eb104ce4768f6ebcccf76bef849 Mon Sep 17 00:00:00 2001 +From: David Howells +Date: Mon, 8 Aug 2022 09:52:35 +0100 +Subject: vfs: Check the truncate maximum size in inode_newsize_ok() + +From: David Howells + +commit e2ebff9c57fe4eb104ce4768f6ebcccf76bef849 upstream. + +If something manages to set the maximum file size to MAX_OFFSET+1, this +can cause the xfs and ext4 filesystems at least to become corrupt. + +Ordinarily, the kernel protects against userspace trying this by +checking the value early in the truncate() and ftruncate() system calls +calls - but there are at least two places that this check is bypassed: + + (1) Cachefiles will round up the EOF of the backing file to DIO block + size so as to allow DIO on the final block - but this might push + the offset negative. It then calls notify_change(), but this + inadvertently bypasses the checking. This can be triggered if + someone puts an 8EiB-1 file on a server for someone else to try and + access by, say, nfs. + + (2) ksmbd doesn't check the value it is given in set_end_of_file_info() + and then calls vfs_truncate() directly - which also bypasses the + check. + +In both cases, it is potentially possible for a network filesystem to +cause a disk filesystem to be corrupted: cachefiles in the client's +cache filesystem; ksmbd in the server's filesystem. + +nfsd is okay as it checks the value, but we can then remove this check +too. + +Fix this by adding a check to inode_newsize_ok(), as called from +setattr_prepare(), thereby catching the issue as filesystems set up to +perform the truncate with minimal opportunity for bypassing the new +check. + +Fixes: 1f08c925e7a3 ("cachefiles: Implement backing file wrangling") +Fixes: f44158485826 ("cifsd: add file operations") +Signed-off-by: David Howells +Reported-by: Jeff Layton +Tested-by: Jeff Layton +Reviewed-by: Namjae Jeon +Cc: stable@kernel.org +Acked-by: Alexander Viro +cc: Steve French +cc: Hyunchul Lee +cc: Chuck Lever +cc: Dave Wysochanski +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + fs/attr.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/fs/attr.c ++++ b/fs/attr.c +@@ -134,6 +134,8 @@ EXPORT_SYMBOL(setattr_prepare); + */ + int inode_newsize_ok(const struct inode *inode, loff_t offset) + { ++ if (offset < 0) ++ return -EINVAL; + if (inode->i_size < offset) { + unsigned long limit; +