From eb46294e2495e8592c423784758fe88f41951c8f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 21 Nov 2022 13:17:23 +0100 Subject: [PATCH] 4.9-stable patches added patches: misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch mmc-core-properly-select-voltage-range-without-power-cycle.patch --- ...eak-in-vmci_host_do_receive_datagram.patch | 77 +++++++++++++++++++ ...ct-voltage-range-without-power-cycle.patch | 47 +++++++++++ queue-4.9/series | 2 + 3 files changed, 126 insertions(+) create mode 100644 queue-4.9/misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch create mode 100644 queue-4.9/mmc-core-properly-select-voltage-range-without-power-cycle.patch diff --git a/queue-4.9/misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch b/queue-4.9/misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch new file mode 100644 index 00000000000..86012fe0c07 --- /dev/null +++ b/queue-4.9/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 +@@ -952,6 +952,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); +@@ -1563,6 +1564,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-4.9/mmc-core-properly-select-voltage-range-without-power-cycle.patch b/queue-4.9/mmc-core-properly-select-voltage-range-without-power-cycle.patch new file mode 100644 index 00000000000..698cac8d232 --- /dev/null +++ b/queue-4.9/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 +@@ -1641,7 +1641,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-4.9/series b/queue-4.9/series index 53c534ea64f..27019a2b4a6 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -60,3 +60,5 @@ iio-pressure-ms5611-changed-hardcoded-spi-speed-to-value-limited.patch dm-ioctl-fix-misbehavior-if-list_versions-races-with-module-loading.patch serial-8250-fall-back-to-non-dma-rx-if-iir_rdi-occurs.patch serial-8250_lpss-configure-dma-also-w-o-dma-filter.patch +mmc-core-properly-select-voltage-range-without-power-cycle.patch +misc-vmw_vmci-fix-an-infoleak-in-vmci_host_do_receive_datagram.patch -- 2.47.3