blockdev: check dinfo ptr before using
PATCH 1/1 blockdev: check dinfo ptr before using
If a user decides to punish a guest by revoking its block device via drive_del, and subsequently also attempts to remove the pci device backing it, and the device is using blockdev_auto_del() then we get a segfault when we attempt to access dinfo->auto_del.[1]
The fix is to check if drive_get_by_blockdev() actually returns a valid dinfo pointer or not.
1. (qemu) pci_add auto storage file=images/test01.raw,if=virtio,id=block1,snapshot=on (qemu) drive_del block1
(qemu) pci_del 5
*segfault*
Signature · 4 lines
Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx [email protected]
blockdev.c +4 -2
@@ -30,14 +30,16 @@ void blockdev_mark_auto_del(BlockDriverState *bs) {DriveInfo *dinfo =drive_get_by_blockdev (bs); - dinfo->auto_del =1 ; +if (dinfo) { + dinfo->auto_del =1 ; + } }void blockdev_auto_del (BlockDriverState *bs) {DriveInfo *dinfo =drive_get_by_blockdev (bs); -if (dinfo->auto_del) { +if (dinfo && dinfo->auto_del) {drive_uninit (dinfo); } }
Quoted 8 lines · On Wed, 8 Dec 2010 10:05:00 -0600 Ryan Harper <[email protected]> wrote:
If a user decides to punish a guest by revoking its block device via
drive_del, and subsequently also attempts to remove the pci device backing it, and the device is usingblockdev_auto_del()then we get a segfault when we attempt to access dinfo->auto_del.[1]The fix is to check if
drive_get_by_blockdev()actually returns a valid dinfo pointer or not.
Quoted 6 lines
1. (qemu)
pci_addauto storage file=images/test01.raw,if=virtio,id=block1,snapshot=on (qemu)drive_delblock1
(qemu)pci_del5
*segfault*Signed-off-by Ryan Harper <[email protected]>
Fixes my test case:
Kevin Wolf
AppliedAm 08.12.2010 17:05, schrieb Ryan Harper:
Quoted 8 lines
If a user decides to punish a guest by revoking its block device via
drive_del, and subsequently also attempts to remove the pci device backing it, and the device is usingblockdev_auto_del()then we get a segfault when we attempt to access dinfo->auto_del.[1]The fix is to check if
drive_get_by_blockdev()actually returns a valid dinfo pointer or not.
Quoted 6 lines
1. (qemu)
pci_addauto storage file=images/test01.raw,if=virtio,id=block1,snapshot=on (qemu)drive_delblock1
(qemu)pci_del5
*segfault*Signed-off-by Ryan Harper <[email protected]>
Thanks, applied to the block branch.
Kevin