block: Don't copy backing file name on error
PATCH 1/1 block: Don't copy backing file name on error
bdrv_open_backing_file() tries to copy the backing file name using pstrcpy directly after calling bdrv_open() to open the backing file without checking whether that was actually successful. If it was not, ps->backing_hd->file will probably be NULL and qemu will crash.
Fix this by moving pstrcpy after checking whether bdrv_open() succeeded.
--- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block.c +2 -2
@@ -1005,8 +1005,6 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) ret =bdrv_open (bs->backing_hd, *backing_filename ? backing_filename :NULL , options, back_flags, back_drv, &local_err); -pstrcpy (bs->backing_file,sizeof (bs->backing_file), - bs->backing_hd->file->filename);if (ret <0 ) {bdrv_unref (bs->backing_hd); bs->backing_hd =NULL ;
@@ -1014,6 +1012,8 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)error_propagate (errp, local_err);return ret; } +pstrcpy (bs->backing_file,sizeof (bs->backing_file), + bs->backing_hd->file->filename);return 0 ; }
Signature · 1 line
1.8.4.1
Quoted 7 lines · Max Reitz
bdrv_open_backing_file()tries to copy the backing file name using pstrcpy directly after callingbdrv_open()to open the backing file without checking whether that was actually successful. If it was not,ps->backing_hd->filewill probably be NULL and qemu will crash.Fix this by moving pstrcpy after checking whether
bdrv_open()succeeded.
Quoted 32 lines
Signed-off-by Max Reitz <[email protected]>--- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)block.c +2
-3@@ -1005,8 +1005,6 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) ret =bdrv_open (bs->backing_hd, *backing_filename ? backing_filename :NULL , options, back_flags, back_drv, &local_err); -pstrcpy (bs->backing_file,sizeof (bs->backing_file), - bs->backing_hd->file->filename);if (ret <0 ) {bdrv_unref (bs->backing_hd); bs->backing_hd =NULL ;@@ -1014,6 +1012,8 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)error_propagate (errp, local_err);return ret; } +pstrcpy (bs->backing_file,sizeof (bs->backing_file), + bs->backing_hd->file->filename);return 0 ; } --1.8.4.1
Quoted 38 lines · Max Reitz
bdrv_open_backing_file()tries to copy the backing file name using pstrcpy directly after callingbdrv_open()to open the backing file without checking whether that was actually successful. If it was not,ps->backing_hd->filewill probably be NULL and qemu will crash.Fix this by moving pstrcpy after checking whether
bdrv_open()succeeded.Signed-off-by Max Reitz <[email protected]>--- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)block.c +2
-2@@ -1005,8 +1005,6 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) ret =bdrv_open (bs->backing_hd, *backing_filename ? backing_filename :NULL , options, back_flags, back_drv, &local_err); -pstrcpy (bs->backing_file,sizeof (bs->backing_file), - bs->backing_hd->file->filename);if (ret <0 ) {bdrv_unref (bs->backing_hd); bs->backing_hd =NULL ;@@ -1014,6 +1012,8 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)error_propagate (errp, local_err);return ret; } +pstrcpy (bs->backing_file,sizeof (bs->backing_file), + bs->backing_hd->file->filename);return 0 ; }Signature · 1 line
1.8.4.1
Am 26.10.2013 um 15:44 hat Max Reitz geschrieben:
Quoted 8 lines
bdrv_open_backing_file()tries to copy the backing file name using pstrcpy directly after callingbdrv_open()to open the backing file without checking whether that was actually successful. If it was not,ps->backing_hd->filewill probably be NULL and qemu will crash.Fix this by moving pstrcpy after checking whether
bdrv_open()succeeded.Signed-off-by Max Reitz <[email protected]>
Thanks, applied. A test case wouldn't hurt, though.
Kevin