From nobody Tue Feb 10 00:22:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487008806973863.2898312269016; Mon, 13 Feb 2017 10:00:06 -0800 (PST) Received: from localhost ([::1]:58561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdKuy-0003m4-MX for importer@patchew.org; Mon, 13 Feb 2017 13:00:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdKLp-00034V-PI for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:23:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdKLo-00060X-MZ for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:23:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57470) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdKLj-0005vm-UQ; Mon, 13 Feb 2017 12:23:40 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 24D6580F8F; Mon, 13 Feb 2017 17:23:40 +0000 (UTC) Received: from noname.redhat.com (ovpn-117-183.ams2.redhat.com [10.36.117.183]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1DHNC3T031842; Mon, 13 Feb 2017 12:23:38 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 13 Feb 2017 18:22:35 +0100 Message-Id: <1487006583-24350-14-git-send-email-kwolf@redhat.com> In-Reply-To: <1487006583-24350-1-git-send-email-kwolf@redhat.com> References: <1487006583-24350-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 13 Feb 2017 17:23:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 13/41] block: Request real permissions in bdrv_attach_child() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jcody@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now that all block drivers with children tell us what permissions they need from each of their children, bdrv_attach_child() can use this information and make the right requirements while trying to attach new children. Signed-off-by: Kevin Wolf --- block.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 682548a..fd06549 100644 --- a/block.c +++ b/block.c @@ -1558,10 +1558,21 @@ BdrvChild *bdrv_attach_child(BlockDriverState *pare= nt_bs, Error **errp) { BdrvChild *child; + uint64_t perm, shared_perm; + + /* XXX This check is a workaround for bdrv_open_inherit(), which attac= hes + * bs->file before bs is opened for format probing. The 'else' branch + * really shouldn't exist. */ + if (parent_bs->drv) { + parent_bs->drv->bdrv_child_perm(parent_bs, NULL, child_role, + 0, BLK_PERM_ALL, &perm, &shared_pe= rm); + } else { + perm =3D 0; + shared_perm =3D BLK_PERM_ALL; + } =20 - /* FIXME Use real permissions */ child =3D bdrv_root_attach_child(child_bs, child_name, child_role, - 0, BLK_PERM_ALL, parent_bs, errp); + perm, shared_perm, parent_bs, errp); if (child =3D=3D NULL) { return NULL; } @@ -2041,6 +2052,8 @@ static BlockDriverState *bdrv_open_inherit(const char= *filename, * probing, the block drivers will do their own bdrv_open_child() for = the * same BDS, which is why we put the node name back into options. */ if ((flags & BDRV_O_PROTOCOL) =3D=3D 0) { + /* FIXME Really shouldn't try to open a child for a still closed b= s, + * see bdrv_attach_child() */ file =3D bdrv_open_child(filename, options, "file", bs, &child_file, true, &local_err); if (local_err) { --=20 1.8.3.1