From nobody Mon May 5 20:13:10 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as
permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1566930435; cv=none;
d=zoho.com; s=zohoarc;
b=XAihF2DY2FuDKxBCRb+OMZpsEVEMGH3GNERCx8018c0XeV6Gh/IyxS/gDd5snYQWDpNTV8UQ/ZByfY+tFyQy/WrUUTfdnj7e+kqCeEZi+J5eG96PLv9t74+TD/W632HTj4J5BSPKzjq0nCFNxX2eSYKhByVKFKCZLf1YylgOaHI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
s=zohoarc;
t=1566930435;
h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
bh=zqPRqDjNWqgYMuYvoBWcfx+UiJ2JuHMLQLedeJUX4z8=;
b=EE4lYexjgemj5CZzciYwwSUhkLn5u/1TykavTBBTR+jIUvmBJNiC+TEFS4IUl7r897e2/M66Rk70E0OdC51eM5Ym1Xb+6PJnWihiCLeq2oYcGv0bMTFznFXmz02j+mlgZSHIaJ/nzqNZXlOTbwzMiQOsrWG0k2zS1NAFR6vOT2w=
ARC-Authentication-Results: i=1; mx.zoho.com;
spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail header.from=<mreitz@redhat.com> (p=none dis=none)
header.from=<mreitz@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 156693043526746.06380592734615;
Tue, 27 Aug 2019 11:27:15 -0700 (PDT)
Received: from localhost ([::1]:55318 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1i2gBV-00052b-K2
for importer@patchew.org; Tue, 27 Aug 2019 14:27:13 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53102)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <mreitz@redhat.com>) id 1i2g7q-0002a2-0A
for qemu-devel@nongnu.org; Tue, 27 Aug 2019 14:23:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <mreitz@redhat.com>) id 1i2g7n-0005Jm-RX
for qemu-devel@nongnu.org; Tue, 27 Aug 2019 14:23:25 -0400
Received: from mx1.redhat.com ([209.132.183.28]:59180)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <mreitz@redhat.com>)
id 1i2g7l-0005Hq-Dh; Tue, 27 Aug 2019 14:23:21 -0400
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
[10.5.11.11])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id C0C2A8980EA;
Tue, 27 Aug 2019 18:23:20 +0000 (UTC)
Received: from localhost (unknown [10.40.205.2])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 56D48600D1;
Tue, 27 Aug 2019 18:23:20 +0000 (UTC)
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Date: Tue, 27 Aug 2019 20:23:00 +0200
Message-Id: <20190827182313.25983-3-mreitz@redhat.com>
In-Reply-To: <20190827182313.25983-1-mreitz@redhat.com>
References: <20190827182313.25983-1-mreitz@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2
(mx1.redhat.com [10.5.110.67]); Tue, 27 Aug 2019 18:23:20 +0000 (UTC)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL 02/15] block: fix permission update in
bdrv_replace_node
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org,
Max Reitz <mreitz@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Content-Type: text/plain; charset="utf-8"
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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>
---
block.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index 874a29a983..5944124845 100644
--- a/block.c
+++ b/block.c
@@ -4165,7 +4165,6 @@ void bdrv_replace_node(BlockDriverState *from, BlockD=
riverState *to,
{
BdrvChild *c, *next;
GSList *list =3D NULL, *p;
- uint64_t old_perm, old_shared;
uint64_t perm =3D 0, shared =3D BLK_PERM_ALL;
int ret;
=20
@@ -4211,8 +4210,8 @@ void bdrv_replace_node(BlockDriverState *from, BlockD=
riverState *to,
bdrv_unref(from);
}
=20
- 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);
=20
out:
g_slist_free(list);
--=20
2.21.0