qcow2: don't leave partially initialized file on image creation
v6 cover qcow2: don't leave partially initialized file on image creation
Use the bdrv_co_delete_file interface to delete the underlying file if qcow2 initialization fails (e.g due to bad encryption secret)
This makes the qcow2 driver behave the same way as the luks driver behaves.
V3: addressed review feedback and reworked commit messages
V4: got rid of code duplication by adding bdrv_co_delete_file_noerr and made the qcow2 driver use this function to delete both the main and the data file.
V5: addresssed review feedback on reworked version.
V6: addressed most of the review feedback.
Best regards,
Maxim Levitsky
Maxim Levitsky (3):
crypto: luks: Fix tiny memory leak
block: add bdrv_co_delete_file_noerr
block: qcow2: remove the created file on initialization error
block.c | 22 ++++++++++++++++++++++ block/crypto.c | 13 ++----------- block/qcow2.c | 8 +++++--- include/block/block.h | 1 + 4 files changed, 30 insertions(+), 14 deletions(-)
Signature · 1 line
2.26.2
PATCH v6 1/3 crypto: luks: Fix tiny memory leak
When the underlying block device doesn't support the bdrv_co_delete_file interface, an 'Error' object was leaked.
--- block/crypto.c | 2 ++ 1 file changed, 2 insertions(+)
block/crypto.c +2 -0
@@ -735,6 +735,8 @@ fail:*/ if ((r_del <0 ) && (r_del != -ENOTSUP )) {error_report_err (local_delete_err); + }else { +error_free (local_delete_err); } }
Signature · 1 line
2.26.2
PATCH v6 2/3 block: add bdrv_co_delete_file_noerr
In reply to Maxim LevitskyThis function wraps bdrv_co_delete_file for the common case of removing a file, which was just created by format driver, on an error condition.
It hides the -ENOTSUPP error, and reports all other errors otherwise.
Use it in luks driver
--- block.c | 22 ++++++++++++++++++++++ block/crypto.c | 15 ++------------- include/block/block.h | 1 + 3 files changed, 25 insertions(+), 13 deletions(-)
block.c +22 -0
@@ -704,6 +704,28 @@ int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp)return ret; } +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs) +{ +Error *local_err =NULL ; +int ret; + +if (!bs) { +return ; + } + + ret =bdrv_co_delete_file (bs, &local_err); +/* +* ENOTSUP will happen if the block driver doesn't support +* the 'bdrv_co_delete_file' interface. This is a predictable +* scenario and shouldn't be reported back to the user. +*/ +if (ret == -ENOTSUP ) { +error_free (local_err); + }else if (ret <0 ) { +error_report_err (local_err); + } +} +/** * Try to get @bs's logical and physical block size. * On success, store them in @bsz struct and return 0.
block/crypto.c +2 -13
@@ -725,19 +725,8 @@ fail:* If an error occurred, delete 'filename'. Even if the file existed * beforehand, it has been truncated and corrupted in the process. */ -if (ret && bs) { -Error *local_delete_err =NULL ; -int r_del =bdrv_co_delete_file (bs, &local_delete_err); -/* -* ENOTSUP will happen if the block driver doesn't support -* the 'bdrv_co_delete_file' interface. This is a predictable -* scenario and shouldn't be reported back to the user. -*/ -if ((r_del <0 ) && (r_del != -ENOTSUP )) { -error_report_err (local_delete_err); - }else { -error_free (local_delete_err); - } +if (ret) { +bdrv_co_delete_file_noerr (bs); }bdrv_unref (bs);
include/block/block.h +1 -0
@@ -428,6 +428,7 @@ int bdrv_freeze_backing_chain(BlockDriverState *bs, BlockDriverState *base, Error **errp);void bdrv_unfreeze_backing_chain (BlockDriverState *bs,BlockDriverState *base); int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp); +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs); typedef struct BdrvCheckResult {
Signature · 1 line
2.26.2
Re: [PATCH v6 2/3] block: add bdrv_co_delete_file_noerr
Quoted 9 lines · Maxim Levitsky
This function wraps
bdrv_co_delete_filefor the common case of removing a file, which was just created by format driver, on an error condition.It hides the
-ENOTSUPPerror, and reports all other errors otherwise.Use it in luks driver
Signed-off-by Maxim Levitsky<[email protected]>Reviewed-by Alberto Garcia<[email protected]>
I still doubt that not reporting ENOTSUPP has a real benefit.. Still, it's preexisting.
Signature · 2 lines
Best regards, Vladimir
PATCH v6 3/3 block: qcow2: remove the created file on initialization error
In reply to Maxim LevitskyIf the qcow initialization fails, we should remove the file if it was already created, to avoid leaving stale files around.
We already do this for luks raw images.
--- block/qcow2.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
block/qcow2.c +5 -3
@@ -3847,12 +3847,14 @@ static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv,/* Create the qcow2 image (format layer) */ ret =qcow2_co_create (create_options, errp); +finish:if (ret <0 ) { - goto finish; +bdrv_co_delete_file_noerr (bs); +bdrv_co_delete_file_noerr (data_bs); + }else { + ret =0 ; } - ret =0 ; -finish:qobject_unref (qdict);bdrv_unref (bs);bdrv_unref (data_bs);
Signature · 1 line
2.26.2
Re: [PATCH v6 3/3] block: qcow2: remove the created file on initialization error
Quoted 7 lines · Maxim Levitsky
If the qcow initialization fails, we should remove the file if it was already created, to avoid leaving stale files around.
We already do this for luks raw images.
Signed-off-by Maxim Levitsky<[email protected]>Reviewed-by Alberto Garcia<[email protected]>
Signature · 2 lines
Best regards, Vladimir
Quoted 25 lines · Maxim Levitsky
Use the
bdrv_co_delete_fileinterface to delete the underlying file if qcow2 initialization fails (e.g due to bad encryption secret)This makes the qcow2 driver behave the same way as the luks driver behaves.
V3: addressed review feedback and reworked commit messages
V4: got rid of code duplication by adding
bdrv_co_delete_file_noerrand made the qcow2 driver use this function to delete both the main and the data file.V5: addresssed review feedback on reworked version.
V6: addressed most of the review feedback.
Best regards,
Maxim LevitskyMaxim Levitsky (3):
crypto: luks: Fix tiny memory leak
block: addbdrv_co_delete_file_noerr
block: qcow2: remove the created file on initialization error
Quoted 11 lines
block.c | 22 ++++++++++++++++++++++ block/crypto.c | 13 ++----------- block/qcow2.c | 8 +++++--- include/block/block.h | 1 + 4 files changed, 30 insertions(+), 14 deletions(-)Signature · 1 line
2.26.2
Any update on this?
Best regards,
Maxim Levitsky
Kevin Wolf
AppliedAm 17.12.2020 um 18:09 hat Maxim Levitsky geschrieben:
Quoted 4 lines
Use the
bdrv_co_delete_fileinterface to delete the underlying file if qcow2 initialization fails (e.g due to bad encryption secret)This makes the qcow2 driver behave the same way as the luks driver behaves.
Thanks, applied to the block branch.
Kevin