aboutsummaryrefslogtreecommitdiff
path: root/block.c
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2019-08-24 13:07:40 +0300
committerMax Reitz <mreitz@redhat.com>2019-09-03 14:55:35 +0200
commitb503de619ed462cd433187db60719f98fab470c2 (patch)
tree1e3e3d77ef3f25eb29372f85396cf2f66d6bb8ff /block.c
parent4d731510d34f280ed45a6de621d016f67a49ea48 (diff)
downloadqemu-b503de619ed462cd433187db60719f98fab470c2.zip
qemu-b503de619ed462cd433187db60719f98fab470c2.tar.gz
qemu-b503de619ed462cd433187db60719f98fab470c2.tar.bz2
block: fix permission update in bdrv_replace_node
It's wrong to OR shared permissions. It may lead to crash on further permission updates. Also, no needs to consider previously calculated permissions, as at this point we already bind all new parents and bdrv_get_cumulative_perm result is enough. So fix the bug by just set permissions by bdrv_get_cumulative_perm result. Bug was introduced in long ago 234ac1a9025, in 2.9. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-id: 20190824100740.61635-1-vsementsov@virtuozzo.com Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/block.c b/block.c
index 874a29a..5944124 100644
--- a/block.c
+++ b/block.c
@@ -4165,7 +4165,6 @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,
{
BdrvChild *c, *next;
GSList *list = NULL, *p;
- uint64_t old_perm, old_shared;
uint64_t perm = 0, shared = BLK_PERM_ALL;
int ret;
@@ -4211,8 +4210,8 @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,
bdrv_unref(from);
}
- bdrv_get_cumulative_perm(to, &old_perm, &old_shared);
- bdrv_set_perm(to, old_perm | perm, old_shared | shared);
+ bdrv_get_cumulative_perm(to, &perm, &shared);
+ bdrv_set_perm(to, perm, shared);
out:
g_slist_free(list);