From: Greg Kroah-Hartman Date: Mon, 20 Jun 2022 10:17:51 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.200~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=280d8231a13b6b1e7a4e7db9557958995886fae9;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch mm-page_alloc-validate-buddy-before-check-its-migratetype.patch virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch --- diff --git a/queue-5.15/alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch b/queue-5.15/alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch new file mode 100644 index 00000000000..00d74238894 --- /dev/null +++ b/queue-5.15/alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch @@ -0,0 +1,33 @@ +From foo@baz Mon Jun 20 12:07:38 PM CEST 2022 +From: Andy Chi +Date: Fri, 13 May 2022 20:16:45 +0800 +Subject: ALSA: hda/realtek: fix right sounds and mute/micmute LEDs for HP machine + +From: Andy Chi + +commit 024a7ad9eb4df626ca8c77fef4f67fd0ebd559d2 upstream. + +The HP EliteBook 630 is using ALC236 codec which used 0x02 to control mute LED +and 0x01 to control micmute LED. Therefore, add a quirk to make it works. + +Signed-off-by: Andy Chi +Cc: +Link: https://lore.kernel.org/r/20220513121648.28584-1-andy.chi@canonical.com +Signed-off-by: Takashi Iwai +[sudip: adjust context] +Signed-off-by: Sudip Mukherjee +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -8857,6 +8857,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), + SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x89aa, "HP EliteBook 630 G9", ALC236_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x89c3, "HP", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), + SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST), diff --git a/queue-5.15/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch b/queue-5.15/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch new file mode 100644 index 00000000000..c519fb2320c --- /dev/null +++ b/queue-5.15/mm-page_alloc-validate-buddy-before-check-its-migratetype.patch @@ -0,0 +1,39 @@ +From 787af64d05cd528aac9ad16752d11bb1c6061bb9 Mon Sep 17 00:00:00 2001 +From: Zi Yan +Date: Wed, 30 Mar 2022 15:45:43 -0700 +Subject: mm: page_alloc: validate buddy before check its migratetype. + +From: Zi Yan + +commit 787af64d05cd528aac9ad16752d11bb1c6061bb9 upstream. + +Whenever a buddy page is found, page_is_buddy() should be called to +check its validity. Add the missing check during pageblock merge check. + +Fixes: 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable pageblocks with others") +Link: https://lore.kernel.org/all/20220330154208.71aca532@gandalf.local.home/ +Reported-and-tested-by: Steven Rostedt +Signed-off-by: Zi Yan +Signed-off-by: Linus Torvalds +Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and other pageblocks") +Cc: stable@vger.kernel.org +Reported-by: zjb194813@alibaba-inc.com +Reported-by: tianhu.hh@alibaba-inc.com +Signed-off-by: Xianting Tian +Signed-off-by: Greg Kroah-Hartman +--- + mm/page_alloc.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -1118,6 +1118,9 @@ continue_merging: + + buddy_pfn = __find_buddy_pfn(pfn, order); + buddy = page + (buddy_pfn - pfn); ++ ++ if (!page_is_buddy(page, buddy, order)) ++ goto done_merging; + buddy_mt = get_pageblock_migratetype(buddy); + + if (migratetype != buddy_mt diff --git a/queue-5.15/series b/queue-5.15/series index d84d1ad73c8..b4fe4b15310 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -100,3 +100,6 @@ ext4-fix-bug_on-ext4_mb_use_inode_pa.patch ext4-make-variable-count-signed.patch ext4-add-reserved-gdt-blocks-check.patch kvm-arm64-don-t-read-a-hw-interrupt-pending-state-in-user-context.patch +alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch +virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch +mm-page_alloc-validate-buddy-before-check-its-migratetype.patch diff --git a/queue-5.15/virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch b/queue-5.15/virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch new file mode 100644 index 00000000000..fe4b6216986 --- /dev/null +++ b/queue-5.15/virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch @@ -0,0 +1,52 @@ +From 7e415282b41bf0d15c6e0fe268f822d9b083f2f7 Mon Sep 17 00:00:00 2001 +From: Murilo Opsfelder Araujo +Date: Thu, 14 Apr 2022 23:30:02 -0300 +Subject: virtio-pci: Remove wrong address verification in vp_del_vqs() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Murilo Opsfelder Araujo + +commit 7e415282b41bf0d15c6e0fe268f822d9b083f2f7 upstream. + +GCC 12 enhanced -Waddress when comparing array address to null [0], +which warns: + + drivers/virtio/virtio_pci_common.c: In function ‘vp_del_vqs’: + drivers/virtio/virtio_pci_common.c:257:29: warning: the comparison will always evaluate as ‘true’ for the pointer operand in ‘vp_dev->msix_affinity_masks + (sizetype)((long unsigned int)i * 256)’ must not be NULL [-Waddress] + 257 | if (vp_dev->msix_affinity_masks[i]) + | ^~~~~~ + +In fact, the verification is comparing the result of a pointer +arithmetic, the address "msix_affinity_masks + i", which will always +evaluate to true. + +Under the hood, free_cpumask_var() calls kfree(), which is safe to pass +NULL, not requiring non-null verification. So remove the verification +to make compiler happy (happy compiler, happy life). + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102103 + +Signed-off-by: Murilo Opsfelder Araujo +Message-Id: <20220415023002.49805-1-muriloo@linux.ibm.com> +Signed-off-by: Michael S. Tsirkin +Acked-by: Christophe de Dinechin +Cc: Sudip Mukherjee +Signed-off-by: Greg Kroah-Hartman +--- + drivers/virtio/virtio_pci_common.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/virtio/virtio_pci_common.c ++++ b/drivers/virtio/virtio_pci_common.c +@@ -254,8 +254,7 @@ void vp_del_vqs(struct virtio_device *vd + + if (vp_dev->msix_affinity_masks) { + for (i = 0; i < vp_dev->msix_vectors; i++) +- if (vp_dev->msix_affinity_masks[i]) +- free_cpumask_var(vp_dev->msix_affinity_masks[i]); ++ free_cpumask_var(vp_dev->msix_affinity_masks[i]); + } + + if (vp_dev->msix_enabled) {