From 933dc8067b9a6588fbdf80e76d855a77226a3ac4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 21 Nov 2022 13:17:50 +0100 Subject: [PATCH] 5.4-stable patches added patches: docs-update-mediator-contact-information-in-coc-doc.patch misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch mmc-core-properly-select-voltage-range-without-power-cycle.patch mmc-sdhci-pci-fix-possible-memory-leak-caused-by-missing-pci_dev_put.patch mmc-sdhci-pci-o2micro-fix-card-detect-fail-issue-caused-by-cd-debounce-timeout.patch --- ...iator-contact-information-in-coc-doc.patch | 30 ++++++++ ...eak-in-vmci_host_do_receive_datagram.patch | 77 +++++++++++++++++++ ...ct-voltage-range-without-power-cycle.patch | 47 +++++++++++ ...y-leak-caused-by-missing-pci_dev_put.patch | 36 +++++++++ ...-issue-caused-by-cd-debounce-timeout.patch | 45 +++++++++++ queue-5.4/series | 5 ++ 6 files changed, 240 insertions(+) create mode 100644 queue-5.4/docs-update-mediator-contact-information-in-coc-doc.patch create mode 100644 queue-5.4/misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch create mode 100644 queue-5.4/mmc-core-properly-select-voltage-range-without-power-cycle.patch create mode 100644 queue-5.4/mmc-sdhci-pci-fix-possible-memory-leak-caused-by-missing-pci_dev_put.patch create mode 100644 queue-5.4/mmc-sdhci-pci-o2micro-fix-card-detect-fail-issue-caused-by-cd-debounce-timeout.patch diff --git a/queue-5.4/docs-update-mediator-contact-information-in-coc-doc.patch b/queue-5.4/docs-update-mediator-contact-information-in-coc-doc.patch new file mode 100644 index 00000000000..5bcdaaf010f --- /dev/null +++ b/queue-5.4/docs-update-mediator-contact-information-in-coc-doc.patch @@ -0,0 +1,30 @@ +From 5fddf8962b429b8303c4a654291ecb6e61a7d747 Mon Sep 17 00:00:00 2001 +From: Shuah Khan +Date: Tue, 11 Oct 2022 11:14:17 -0600 +Subject: docs: update mediator contact information in CoC doc + +From: Shuah Khan + +commit 5fddf8962b429b8303c4a654291ecb6e61a7d747 upstream. + +Update mediator contact information in CoC interpretation document. + +Cc: +Signed-off-by: Shuah Khan +Link: https://lore.kernel.org/r/20221011171417.34286-1-skhan@linuxfoundation.org +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/process/code-of-conduct-interpretation.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/process/code-of-conduct-interpretation.rst ++++ b/Documentation/process/code-of-conduct-interpretation.rst +@@ -51,7 +51,7 @@ the Technical Advisory Board (TAB) or ot + uncertain how to handle situations that come up. It will not be + considered a violation report unless you want it to be. If you are + uncertain about approaching the TAB or any other maintainers, please +-reach out to our conflict mediator, Joanna Lee . ++reach out to our conflict mediator, Joanna Lee . + + In the end, "be kind to each other" is really what the end goal is for + everybody. We know everyone is human and we all fail at times, but the diff --git a/queue-5.4/misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch b/queue-5.4/misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch new file mode 100644 index 00000000000..07b3e1c5569 --- /dev/null +++ b/queue-5.4/misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch @@ -0,0 +1,77 @@ +From e5b0d06d9b10f5f43101bd6598b076c347f9295f Mon Sep 17 00:00:00 2001 +From: Alexander Potapenko +Date: Fri, 4 Nov 2022 18:58:49 +0100 +Subject: misc/vmw_vmci: fix an infoleak in vmci_host_do_receive_datagram() + +From: Alexander Potapenko + +commit e5b0d06d9b10f5f43101bd6598b076c347f9295f upstream. + +`struct vmci_event_qp` allocated by qp_notify_peer() contains padding, +which may carry uninitialized data to the userspace, as observed by +KMSAN: + + BUG: KMSAN: kernel-infoleak in instrument_copy_to_user ./include/linux/instrumented.h:121 + instrument_copy_to_user ./include/linux/instrumented.h:121 + _copy_to_user+0x5f/0xb0 lib/usercopy.c:33 + copy_to_user ./include/linux/uaccess.h:169 + vmci_host_do_receive_datagram drivers/misc/vmw_vmci/vmci_host.c:431 + vmci_host_unlocked_ioctl+0x33d/0x43d0 drivers/misc/vmw_vmci/vmci_host.c:925 + vfs_ioctl fs/ioctl.c:51 + ... + + Uninit was stored to memory at: + kmemdup+0x74/0xb0 mm/util.c:131 + dg_dispatch_as_host drivers/misc/vmw_vmci/vmci_datagram.c:271 + vmci_datagram_dispatch+0x4f8/0xfc0 drivers/misc/vmw_vmci/vmci_datagram.c:339 + qp_notify_peer+0x19a/0x290 drivers/misc/vmw_vmci/vmci_queue_pair.c:1479 + qp_broker_attach drivers/misc/vmw_vmci/vmci_queue_pair.c:1662 + qp_broker_alloc+0x2977/0x2f30 drivers/misc/vmw_vmci/vmci_queue_pair.c:1750 + vmci_qp_broker_alloc+0x96/0xd0 drivers/misc/vmw_vmci/vmci_queue_pair.c:1940 + vmci_host_do_alloc_queuepair drivers/misc/vmw_vmci/vmci_host.c:488 + vmci_host_unlocked_ioctl+0x24fd/0x43d0 drivers/misc/vmw_vmci/vmci_host.c:927 + ... + + Local variable ev created at: + qp_notify_peer+0x54/0x290 drivers/misc/vmw_vmci/vmci_queue_pair.c:1456 + qp_broker_attach drivers/misc/vmw_vmci/vmci_queue_pair.c:1662 + qp_broker_alloc+0x2977/0x2f30 drivers/misc/vmw_vmci/vmci_queue_pair.c:1750 + + Bytes 28-31 of 48 are uninitialized + Memory access of size 48 starts at ffff888035155e00 + Data copied to user address 0000000020000100 + +Use memset() to prevent the infoleaks. + +Also speculatively fix qp_notify_peer_local(), which may suffer from the +same problem. + +Reported-by: syzbot+39be4da489ed2493ba25@syzkaller.appspotmail.com +Cc: stable +Fixes: 06164d2b72aa ("VMCI: queue pairs implementation.") +Signed-off-by: Alexander Potapenko +Reviewed-by: Vishnu Dasa +Link: https://lore.kernel.org/r/20221104175849.2782567-1-glider@google.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/misc/vmw_vmci/vmci_queue_pair.c ++++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c +@@ -852,6 +852,7 @@ static int qp_notify_peer_local(bool att + u32 context_id = vmci_get_context_id(); + struct vmci_event_qp ev; + ++ memset(&ev, 0, sizeof(ev)); + ev.msg.hdr.dst = vmci_make_handle(context_id, VMCI_EVENT_HANDLER); + ev.msg.hdr.src = vmci_make_handle(VMCI_HYPERVISOR_CONTEXT_ID, + VMCI_CONTEXT_RESOURCE_ID); +@@ -1465,6 +1466,7 @@ static int qp_notify_peer(bool attach, + * kernel. + */ + ++ memset(&ev, 0, sizeof(ev)); + ev.msg.hdr.dst = vmci_make_handle(peer_id, VMCI_EVENT_HANDLER); + ev.msg.hdr.src = vmci_make_handle(VMCI_HYPERVISOR_CONTEXT_ID, + VMCI_CONTEXT_RESOURCE_ID); diff --git a/queue-5.4/mmc-core-properly-select-voltage-range-without-power-cycle.patch b/queue-5.4/mmc-core-properly-select-voltage-range-without-power-cycle.patch new file mode 100644 index 00000000000..7a64f05b4ae --- /dev/null +++ b/queue-5.4/mmc-core-properly-select-voltage-range-without-power-cycle.patch @@ -0,0 +1,47 @@ +From 39a72dbfe188291b156dd6523511e3d5761ce775 Mon Sep 17 00:00:00 2001 +From: Yann Gautier +Date: Fri, 28 Oct 2022 09:37:40 +0200 +Subject: mmc: core: properly select voltage range without power cycle + +From: Yann Gautier + +commit 39a72dbfe188291b156dd6523511e3d5761ce775 upstream. + +In mmc_select_voltage(), if there is no full power cycle, the voltage +range selected at the end of the function will be on a single range +(e.g. 3.3V/3.4V). To keep a range around the selected voltage (3.2V/3.4V), +the mask shift should be reduced by 1. + +This issue was triggered by using a specific SD-card (Verbatim Premium +16GB UHS-1) on an STM32MP157C-DK2 board. This board cannot do UHS modes +and there is no power cycle. And the card was failing to switch to +high-speed mode. When adding the range 3.2V/3.3V for this card with the +proposed shift change, the card can switch to high-speed mode. + +Fixes: ce69d37b7d8f ("mmc: core: Prevent violation of specs while initializing cards") +Signed-off-by: Yann Gautier +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20221028073740.7259-1-yann.gautier@foss.st.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/core/core.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/mmc/core/core.c ++++ b/drivers/mmc/core/core.c +@@ -1145,7 +1145,13 @@ u32 mmc_select_voltage(struct mmc_host * + mmc_power_cycle(host, ocr); + } else { + bit = fls(ocr) - 1; +- ocr &= 3 << bit; ++ /* ++ * The bit variable represents the highest voltage bit set in ++ * the OCR register. ++ * To keep a range of 2 values (e.g. 3.2V/3.3V and 3.3V/3.4V), ++ * we must shift the mask '3' with (bit - 1). ++ */ ++ ocr &= 3 << (bit - 1); + if (bit != host->ios.vdd) + dev_warn(mmc_dev(host), "exceeding card's volts\n"); + } diff --git a/queue-5.4/mmc-sdhci-pci-fix-possible-memory-leak-caused-by-missing-pci_dev_put.patch b/queue-5.4/mmc-sdhci-pci-fix-possible-memory-leak-caused-by-missing-pci_dev_put.patch new file mode 100644 index 00000000000..b77239b7574 --- /dev/null +++ b/queue-5.4/mmc-sdhci-pci-fix-possible-memory-leak-caused-by-missing-pci_dev_put.patch @@ -0,0 +1,36 @@ +From 222cfa0118aa68687ace74aab8fdf77ce8fbd7e6 Mon Sep 17 00:00:00 2001 +From: Xiongfeng Wang +Date: Mon, 14 Nov 2022 16:31:00 +0800 +Subject: mmc: sdhci-pci: Fix possible memory leak caused by missing pci_dev_put() + +From: Xiongfeng Wang + +commit 222cfa0118aa68687ace74aab8fdf77ce8fbd7e6 upstream. + +pci_get_device() will increase the reference count for the returned +pci_dev. We need to use pci_dev_put() to decrease the reference count +before amd_probe() returns. There is no problem for the 'smbus_dev == +NULL' branch because pci_dev_put() can also handle the NULL input +parameter case. + +Fixes: 659c9bc114a8 ("mmc: sdhci-pci: Build o2micro support in the same module") +Signed-off-by: Xiongfeng Wang +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20221114083100.149200-1-wangxiongfeng2@huawei.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/host/sdhci-pci-core.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/mmc/host/sdhci-pci-core.c ++++ b/drivers/mmc/host/sdhci-pci-core.c +@@ -1795,6 +1795,8 @@ static int amd_probe(struct sdhci_pci_ch + } + } + ++ pci_dev_put(smbus_dev); ++ + if (gen == AMD_CHIPSET_BEFORE_ML || gen == AMD_CHIPSET_CZ) + chip->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD; + diff --git a/queue-5.4/mmc-sdhci-pci-o2micro-fix-card-detect-fail-issue-caused-by-cd-debounce-timeout.patch b/queue-5.4/mmc-sdhci-pci-o2micro-fix-card-detect-fail-issue-caused-by-cd-debounce-timeout.patch new file mode 100644 index 00000000000..033ad93e0ff --- /dev/null +++ b/queue-5.4/mmc-sdhci-pci-o2micro-fix-card-detect-fail-issue-caused-by-cd-debounce-timeout.patch @@ -0,0 +1,45 @@ +From 096cc0cddf58232bded309336961784f1d1c85f8 Mon Sep 17 00:00:00 2001 +From: Chevron Li +Date: Fri, 4 Nov 2022 02:55:12 -0700 +Subject: mmc: sdhci-pci-o2micro: fix card detect fail issue caused by CD# debounce timeout + +From: Chevron Li + +commit 096cc0cddf58232bded309336961784f1d1c85f8 upstream. + +The SD card is recognized failed sometimes when resume from suspend. +Because CD# debounce time too long then card present report wrong. +Finally, card is recognized failed. + +Signed-off-by: Chevron Li +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20221104095512.4068-1-chevron.li@bayhubtech.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/host/sdhci-pci-o2micro.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/mmc/host/sdhci-pci-o2micro.c ++++ b/drivers/mmc/host/sdhci-pci-o2micro.c +@@ -31,6 +31,7 @@ + #define O2_SD_CAPS 0xE0 + #define O2_SD_ADMA1 0xE2 + #define O2_SD_ADMA2 0xE7 ++#define O2_SD_MISC_CTRL2 0xF0 + #define O2_SD_INF_MOD 0xF1 + #define O2_SD_MISC_CTRL4 0xFC + #define O2_SD_TUNING_CTRL 0x300 +@@ -777,6 +778,12 @@ int sdhci_pci_o2_probe(struct sdhci_pci_ + /* Set Tuning Windows to 5 */ + pci_write_config_byte(chip->pdev, + O2_SD_TUNING_CTRL, 0x55); ++ //Adjust 1st and 2nd CD debounce time ++ pci_read_config_dword(chip->pdev, O2_SD_MISC_CTRL2, &scratch_32); ++ scratch_32 &= 0xFFE7FFFF; ++ scratch_32 |= 0x00180000; ++ pci_write_config_dword(chip->pdev, O2_SD_MISC_CTRL2, scratch_32); ++ pci_write_config_dword(chip->pdev, O2_SD_DETECT_SETTING, 1); + /* Lock WP */ + ret = pci_read_config_byte(chip->pdev, + O2_SD_LOCK_WP, &scratch); diff --git a/queue-5.4/series b/queue-5.4/series index 4e25059bfd6..eb7a66f3b37 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -131,3 +131,8 @@ serial-8250-fall-back-to-non-dma-rx-if-iir_rdi-occurs.patch serial-8250_lpss-configure-dma-also-w-o-dma-filter.patch input-iforce-invert-valid-length-check-when-fetching-device-ids.patch scsi-zfcp-fix-double-free-of-fsf-request-when-qdio-send-fails.patch +mmc-core-properly-select-voltage-range-without-power-cycle.patch +mmc-sdhci-pci-o2micro-fix-card-detect-fail-issue-caused-by-cd-debounce-timeout.patch +mmc-sdhci-pci-fix-possible-memory-leak-caused-by-missing-pci_dev_put.patch +docs-update-mediator-contact-information-in-coc-doc.patch +misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch -- 2.47.3