From nobody Mon Feb 9 12:10:30 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1595860771; cv=none; d=zohomail.com; s=zohoarc; b=DTvjgxeQxpvySgkKZaYwqhYcfM1QytiUiygySkuziDAA9Tr+aOuvdRGkOt9Hv+x7zw6nmWV0gjZ2eIhKYlifIz8x257Yk5Qv2OYfx2xApAUOEZ21Xvh/l96ZnALvt0/vjrCp8IzNPzztRnEUk4yYcGwl6YwxZJkrJX4494rG7t8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595860771; h=Content-Type: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; bh=fp8X7gIpKH6iz8HjHeEv2VjCcxBcFNqJiwjqghVZCuI=; b=aLyV0lyz9SGUzvI58lIlmH+2tIOJQnwO6poxox6uqh4OkDQtualnZTdeyR+hgRGzG3IRDowqldIJpJ49sN9r21EaFM7YN64X2PDTZsmMaun9kxhUdxTEIVAWOQIf5QC9OiladKB4DKiR+rTkCsTNqa6TYjzedPWM2oqTcbwHcMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595860771026899.4382186275709; Mon, 27 Jul 2020 07:39:31 -0700 (PDT) Received: from localhost ([::1]:54722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k04Ho-0004fv-HW for importer@patchew.org; Mon, 27 Jul 2020 10:39:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k04Gk-0002vS-SN for qemu-devel@nongnu.org; Mon, 27 Jul 2020 10:38:22 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29689 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k04Gj-0001xW-2o for qemu-devel@nongnu.org; Mon, 27 Jul 2020 10:38:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-246-qxvSwG-SNVqdv9_O1wV63w-1; Mon, 27 Jul 2020 10:38:17 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98266100AA25; Mon, 27 Jul 2020 14:38:16 +0000 (UTC) Received: from localhost (ovpn-113-45.ams2.redhat.com [10.36.113.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F95F10013C0; Mon, 27 Jul 2020 14:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595860700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fp8X7gIpKH6iz8HjHeEv2VjCcxBcFNqJiwjqghVZCuI=; b=Ats0DdC9uNc8C2r2wR4MkKw1ntT9XT348WqH3gXlBpTeoR78VybOvO3rMPnxV6uKJ6FXoW IMpawySnxbKv5aPtWk5yGkBqvtmMU2y2xFkPGz62zQPtza+w3Yba44bZg8QUvHfKZjLHpe CTfmazKihTgZWawpdIb5+xZN/09v3ec= X-MC-Unique: qxvSwG-SNVqdv9_O1wV63w-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 1/3] block/amend: Check whether the node exists Date: Mon, 27 Jul 2020 16:38:10 +0200 Message-Id: <20200727143812.1101547-2-mreitz@redhat.com> In-Reply-To: <20200727143812.1101547-1-mreitz@redhat.com> References: <20200727143812.1101547-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/27 01:44:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We should check whether the user-specified node-name actually refers to a node. The simplest way to do that is to use bdrv_lookup_bs() instead of bdrv_find_node() (the former wraps the latter, and produces an error message if necessary). Reported-by: Coverity (CID 1430268) Fixes: ced914d0ab9fb2c900f873f6349a0b8eecd1fdbe Signed-off-by: Max Reitz Message-Id: <20200710095037.10885-1-mreitz@redhat.com> Reviewed-by: Maxim Levitsky --- block/amend.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/amend.c b/block/amend.c index f4612dcf08..392df9ef83 100644 --- a/block/amend.c +++ b/block/amend.c @@ -69,8 +69,12 @@ void qmp_x_blockdev_amend(const char *job_id, BlockdevAmendJob *s; const char *fmt =3D BlockdevDriver_str(options->driver); BlockDriver *drv =3D bdrv_find_format(fmt); - BlockDriverState *bs =3D bdrv_find_node(node_name); + BlockDriverState *bs; =20 + bs =3D bdrv_lookup_bs(NULL, node_name, errp); + if (!bs) { + return; + } =20 if (!drv) { error_setg(errp, "Block driver '%s' not found or not supported", f= mt); --=20 2.26.2