[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/7] sd: Avoid access to NULL BlockDriverState
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 2/7] sd: Avoid access to NULL BlockDriverState |
Date: |
Fri, 18 Oct 2013 16:18:30 +0200 |
From: Andreas Färber <address@hidden>
Commit 4f8a066b5fc254eeaabbbde56ba4f5b29cc68fdf (blockdev: Remove IF_*
check for read-only blockdev_init) added a usage of bdrv_is_read_only()
to sd_init(), which is called for versatilepb, versatileab and
xilinx-zynq-a9 machines among others with NULL argument by default,
causing the new qom-test to fail.
Add a check to prevent this.
Suggested-by: Kevin Wolf <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/sd/sd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 7380f06..4502ad1 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -494,7 +494,7 @@ SDState *sd_init(BlockDriverState *bs, bool is_spi)
{
SDState *sd;
- if (bdrv_is_read_only(bs)) {
+ if (bs && bdrv_is_read_only(bs)) {
fprintf(stderr, "sd_init: Cannot use read-only drive\n");
return NULL;
}
--
1.8.3.1
- [Qemu-devel] [PULL 0/7] Block patches, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 2/7] sd: Avoid access to NULL BlockDriverState,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 1/7] hmp: drop bogus "[not inserted]", Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 5/7] virtio: Remove unneeded memcpy, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 3/7] blockdev: fix cdrom read_only flag, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 4/7] block/raw-win32: Always use -errno in hdev_open, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 6/7] vmdk: Only read cid from image file when opening, Stefan Hajnoczi, 2013/10/18
- [Qemu-devel] [PULL 7/7] vmdk: fix VMFS extent parsing, Stefan Hajnoczi, 2013/10/18