avoid OOB access in SD card emulator
cover avoid OOB access in SD card emulator
From: Prasad J Pandit <[email protected]>
Hello,
* This patch series fixes an OOB access issue while performing block write commands in SD card emulator.
* Second patch disables the sdhci-pci device build by default.
Thank you.
--
Prasad J Pandit (2):
sd: check bit number before setting card_status flag
sd: disable sdhci-pci device by default
hw/sd/Kconfig | 1 - hw/sd/sd.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/2 sd: check bit number before setting card_status flag
From: Prasad J Pandit <[email protected]>
SD card emulator sets 'sd->card_status' while performing block write commands. While doing so, it tests the corresponding bit derived from 's->data_start' address. This may lead to OOB access. Add check to avoid it.
--- hw/sd/sd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
hw/sd/sd.c +6 -1
@@ -802,7 +802,12 @@ static void sd_function_switch(SDState *sd, uint32_t arg)static inline bool sd_wp_addr (SDState *sd,uint64_t addr) { -return test_bit (sd_addr_to_wpnum (addr), sd->wp_groups); +uint64_t bit =sd_addr_to_wpnum (addr); + +if (bit < sd->wpgrps_size) { +return test_bit (bit, sd->wp_groups); + } +return true; }static void sd_lock_command (SDState *sd)
Signature · 1 line
2.26.2
PATCH 2/2 sd: disable sdhci-pci device by default
In reply to P J PFrom: Prasad J Pandit <[email protected]>
Disable rarely used sdhci-pci device build by default.
--- hw/sd/Kconfig | 1 - 1 file changed, 1 deletion(-)
hw/sd/Kconfig +0 -1
@@ -16,6 +16,5 @@ config SDHCI config SDHCI_PCI bool - default y if PCI_DEVICES depends on PCI select SDHCI
Signature · 1 line
2.26.2
Re: [PATCH 2/2] sd: disable sdhci-pci device by default
Quoted 8 lines · P J P
From: Prasad J Pandit <[email protected]>
Disable rarely used sdhci-pci device build by default.
Suggested-by Stefan Hajnoczi <[email protected]>Signed-off-by Prasad J Pandit <[email protected]>---
Doesn't this break existing working command lines? The device exists, some people use it. We should treat it like other PCI devices -- if the guest arch/machine can handle PCI the device should be built.
There's obviously scope for being more general and allowing some kind of "only build the subset of devices we feel more confident abut the security of" setup (don't RH do something like this downstream?), but upstream we don't have a concept like that, we just build everything.
thanks
-- PMM
Re: [PATCH 2/2] sd: disable sdhci-pci device by default
+Kevin, Paolo, Emanuele
Quoted 6 lines · Peter Maydell
Quoted 5 lines · P J P
From: Prasad J Pandit <[email protected]>
Disable rarely used sdhci-pci device build by default.
Quoted 8 lines
Quoted 3 lines
Suggested-by Stefan Hajnoczi <[email protected]>Signed-off-by Prasad J Pandit <[email protected]>---
Doesn't this break existing working command lines? The device exists, some people use it. We should treat it like other PCI devices -- if the guest
arch/machinecan handle PCI the device should be built.
Prasad, I once tried to remove it, and Kevin said he was using it:
https://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg02765.html
I do find qemu's PCI SDHCI support useful for testing. SeaBIOS can launch an OS from PCI SDHCI (qemu-system-x86_64 -device sdhci-pci -device sd-card,drive=drive0 -drive id=drive0,if=none,file=dos-drivec) and linux has drivers for it as well. A number of the Chromebooks ship with PCI SDHCI devices on them, so it's not an unheard of configuration.
Quoted 6 lines
There's obviously scope for being more general and allowing some kind of "only build the subset of devices we feel more confident abut the security of" setup (don't RH do something like this downstream?), but upstream we don't have a concept like that, we just build everything.
Prasad, again back at that time I tried to remove this (as the device appears unused) Paolo told me after asking explanation for his comment "PCI devices can be created with -device, they don't have to be added by boards." [*] - I guess it was on IRC - to check commit 224d10ff5ae, this device was added with RH PCI ID because it was useful for testing:
static void sdhci_pci_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = sdhci_pci_init;
k->exit = sdhci_pci_exit;
k->vendor_id = PCI_VENDOR_ID_REDHAT;
k->device_id = PCI_DEVICE_ID_REDHAT_SDHCI;
k->class_id = PCI_CLASS_SYSTEM_SDHCI;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
...This device is also nicely used as example for the qgraph testing (see tests/test-qgraph.c added in fc281c80202).
[*] https://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg02819.html
Peter, indeed the Kconfig was added to allow distributions to disable piece of code, and we want to keep this device in mainstream QEMU. Distributions are free to disable it setting SDHCI_PCI=n
So to this patch:
Nack.
Quoted 4 lines
thanks
-- PMM
Re: [PATCH 2/2] sd: disable sdhci-pci device by default
In reply to Peter MaydellQuoted 15 lines · Peter Maydell
Quoted 8 lines · P J P
From: Prasad J Pandit <[email protected]>
Disable rarely used sdhci-pci device build by default.
Suggested-by Stefan Hajnoczi <[email protected]>Signed-off-by Prasad J Pandit <[email protected]>---
Doesn't this break existing working command lines? The device exists, some people use it. We should treat it like other PCI devices -- if the guest
arch/machinecan handle PCI the device should be built.
Quoted 5 lines
There's obviously scope for being more general and allowing some kind of "only build the subset of devices we feel more confident abut the security of" setup (don't RH do something like this downstream?), but upstream we don't have a concept like that, we just build everything.
Yeah, disabling undesired devices is really a job for downstream and Red Hat do indeed do this in RHEL builds of QEMU.
What's missing from an upstream side I think is largely a documentation issue. ie a way to actually tell our users the good, bad & the ugly for QEMU features, so they can make informed decision to disable stuff if they wish.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 1/2] sd: check bit number before setting card_status flag
In reply to P J PHi Prasad,
Quoted 6 lines · P J P
From: Prasad J Pandit <[email protected]>
SD card emulator sets '
sd->card_status' while performing block write commands. While doing so, it tests the corresponding bit derived from 's->data_start' address. This may lead to OOB access. Add check to avoid it.
Ah, this is different that the one reported recently:
https://bugs.launchpad.net/qemu/+bug/1878054
Do you have a reproducer?
Is this a CVE?
Quoted 2 lines
Reported-by Alex <[email protected]>
This is not Alexander complete name.
Quoted 10 lines
Signed-off-by Prasad J Pandit <[email protected]>--- hw/sd/sd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)hw/sd/sd.c +0
-0
hw/sd/sd.c static void sd_function_switch(SDState *sd, uint32_t arg) · line 807
Quoted 7 lines
hw/sd/sd.c +3
-1@@ -802,7 +802,12 @@ static void sd_function_switch(SDState *sd, uint32_t arg)static inline bool sd_wp_addr (SDState *sd,uint64_t addr) { -return test_bit (sd_addr_to_wpnum (addr), sd->wp_groups); +uint64_t bit =sd_addr_to_wpnum (addr); + +if (bit < sd->wpgrps_size) {
This should never be called with a such address, so I'd simply use an assertion here.
The problem is earlier where the address should be validated and a protocol error returned.
Quoted 7 lines
hw/sd/sd.c +3
-0+return test_bit (bit, sd->wp_groups); + } +return true; }static void sd_lock_command (SDState *sd)
Re: [PATCH 2/2] sd: disable sdhci-pci device by default
In reply to Philippe Mathieu-Daudé+-- On Wed, 20 May 2020, Philippe Mathieu-Daudé wrote --+ | Prasad, I once tried to remove it, and Kevin said he was using it: | | https://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg02765.html | | I do find qemu's PCI SDHCI support useful for testing. | SeaBIOS can launch an OS from PCI SDHCI (qemu-system-x86_64 | -device sdhci-pci -device sd-card,drive=drive0 -drive | id=drive0,if=none,file=dos-drivec) and linux has drivers for | it as well. A number of the Chromebooks ship with PCI SDHCI | devices on them, so it's not an unheard of configuration. | | Prasad, again back at that time I tried to remove this (as the device appears | unused) Paolo told me after asking explanation for his comment "PCI devices | can be created with -device, they don't have to be added by | boards." [*] - I guess it was on IRC - to check commit 224d10ff5ae, this | device was added with RH PCI ID because it was useful for testing: | | ... | | This device is also nicely used as example for the qgraph testing (see | tests/test-qgraph.c added in fc281c80202). | | [*] https://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg02819.html | | Peter, indeed the Kconfig was added to allow distributions to disable piece of | code, and we want to keep this device in mainstream QEMU. | Distributions are free to disable it setting SDHCI_PCI=n | | So to this patch: | | Nack.
Right, okay. (I half expected it ;)
Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
8685 545E B54C 486B C6EB 271E E285 8B5A F050 DE8D