[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [Qemu-devel] [PULL 50/85] qcow2: add .bdrv_remove_persi
From: |
Peter Maydell |
Subject: |
Re: [Qemu-block] [Qemu-devel] [PULL 50/85] qcow2: add .bdrv_remove_persistent_dirty_bitmap |
Date: |
Fri, 14 Jul 2017 11:42:49 +0100 |
On 11 July 2017 at 17:07, Max Reitz <address@hidden> wrote:
> From: Vladimir Sementsov-Ogievskiy <address@hidden>
>
> Realize .bdrv_remove_persistent_dirty_bitmap interface.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> Reviewed-by: Max Reitz <address@hidden>
> Reviewed-by: John Snow <address@hidden>
> Message-id: address@hidden
> Signed-off-by: Max Reitz <address@hidden>
> +void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs,
> + const char *name,
> + Error **errp)
> +{
> + int ret;
> + BDRVQcow2State *s = bs->opaque;
> + Qcow2Bitmap *bm;
> + Qcow2BitmapList *bm_list;
> +
> + if (s->nb_bitmaps == 0) {
> + /* Absence of the bitmap is not an error: see explanation above
> + * bdrv_remove_persistent_dirty_bitmap() definition. */
> + return;
> + }
> +
> + bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
> + s->bitmap_directory_size, errp);
> + if (bm_list == NULL) {
> + return;
> + }
> +
> + bm = find_bitmap_by_name(bm_list, name);
> + if (bm == NULL) {
> + goto fail;
> + }
> +
> + QSIMPLEQ_REMOVE(bm_list, bm, Qcow2Bitmap, entry);
> +
> + ret = update_ext_header_and_dir(bs, bm_list);
> + if (ret < 0) {
> + error_setg_errno(errp, -ret, "Failed to update bitmap extension");
> + goto fail;
> + }
> +
> + free_bitmap_clusters(bs, &bm->table);
> +
> +fail:
> + bitmap_free(bm);
> + bitmap_list_free(bm_list);
> +}
Coverity points out that this can crash in the error-exit paths,
because bitmap_free() doesn't handle being passed a NULL pointer.
(CID 1377700).
Probably the best fix for this is to make bitmap_free() do
nothing when handed NULL.
thanks
-- PMM
- [Qemu-block] [PULL 41/85] qcow2: add persistent dirty bitmaps support, (continued)
- [Qemu-block] [PULL 41/85] qcow2: add persistent dirty bitmaps support, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 42/85] qcow2: store bitmaps on reopening image as read-only, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 44/85] qcow2: add .bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 43/85] block: add bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 45/85] qmp: add persistent flag to block-dirty-bitmap-add, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 46/85] qmp: add autoload parameter to block-dirty-bitmap-add, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 48/85] iotests: test qcow2 persistent dirty bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 47/85] qmp: add x-debug-block-dirty-bitmap-sha256, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 49/85] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 50/85] qcow2: add .bdrv_remove_persistent_dirty_bitmap, Max Reitz, 2017/07/11
- Re: [Qemu-block] [Qemu-devel] [PULL 50/85] qcow2: add .bdrv_remove_persistent_dirty_bitmap,
Peter Maydell <=
- [Qemu-block] [PULL 52/85] block: release persistent bitmaps on inactivate, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 51/85] qmp: block-dirty-bitmap-remove: remove persistent, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 53/85] iotests: skip 159 & 170 with luks format, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 54/85] iotests: fix remainining tests to work with LUKS, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 55/85] iotests: reduce PBKDF iterations when testing LUKS, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 56/85] iotests: add more LUKS hash combination tests, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 58/85] iotests: Use absolute paths for executables, Max Reitz, 2017/07/11