From patchwork Mon Feb 1 15:37:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12059367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DB81C433E0 for ; Mon, 1 Feb 2021 15:43:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 723F864E3C for ; Mon, 1 Feb 2021 15:43:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 723F864E3C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6bLv-0004yh-EK for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 10:42:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6bGG-0006Z5-7I for qemu-devel@nongnu.org; Mon, 01 Feb 2021 10:37:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6bGE-00024y-HZ for qemu-devel@nongnu.org; Mon, 01 Feb 2021 10:37:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612193826; 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; bh=NiiPUtBQWDN924NgCHiXVlqTEUm0sOxUKiZegSkevc8=; b=AKT/YHOsECsCfyGphUMCHDH3dvLS3tPPAgemJ6iiyc3oVexlphMTRkaMDQGvRSgO9dMAt6 Kgr5GZhEf49cEqRlM2hCw3IbYEg9Z/pkuzTTzp2zHQIxmaBV+Krv/5Tv6KVAKykCKc3tCd SbdAhAWyijLJLpYIH0JFWX0BaMceSW4= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-f9qFEbrTPvi7ILMp1B-mJQ-1; Mon, 01 Feb 2021 10:37:04 -0500 X-MC-Unique: f9qFEbrTPvi7ILMp1B-mJQ-1 Received: by mail-ed1-f72.google.com with SMTP id w14so610078edv.6 for ; Mon, 01 Feb 2021 07:37:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NiiPUtBQWDN924NgCHiXVlqTEUm0sOxUKiZegSkevc8=; b=TJLORYcS34ggeBHSCxactiAYsQh9K/z2B0D6IZwGZmv0l4qm+D0xURi3bn0409j2ct 677tQkjAZrxI2eGv93tc4RZ7AaixSe3kCFK7NFEpP/EB31LFeWXJlnSrhSKXWmXIEl7K jkM4Ys35p3emfP/gEztEJcKLmhV9MtFcKrlAJfgQHxJEkyWlbRdufniXo7xjHweGxm6L 4rZH9tDzljh2895QaYlAKylEbV1lPvdqvkW/hbGvmNyMC+OR6n7ruMjLMUnTxCYq134c CMyIhLe6cjQYWbjJLdRQOl2xXkKNcPZ+9tbsKn+72WRkI/dIPUzHMQc6AGPhKC3oFHHh qgjA== X-Gm-Message-State: AOAM531lYvo1T+GGDE35FZ4/iOIPhGOAvpABWwy213aYfrTBwOctsulQ FcJAFfJ7xgaDU3GLDqLWpA21NvKCcdBVUJ5eCEA6cGmKdCCkfMd4FtnvkdR59AGfO16be9jzuGQ ZxdmVJgxlwOJO0WzkPtH3dKzfKc39E9yEAHaZQa+KdMLKgZT5ySUMIqPCRW5flfKN X-Received: by 2002:a17:906:8617:: with SMTP id o23mr5994849ejx.289.1612193822888; Mon, 01 Feb 2021 07:37:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJyBhQARvhvSGmU091A6RhUM0w5GOuCNzGgufBftNqzbhuVuAN/9VyZ14eNGU7SxigHmr8r9fw== X-Received: by 2002:a17:906:8617:: with SMTP id o23mr5994822ejx.289.1612193822591; Mon, 01 Feb 2021 07:37:02 -0800 (PST) Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id i18sm8694276edt.68.2021.02.01.07.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 07:37:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] hw/pci: Have safer pcie_bus_realize() by checking error path Date: Mon, 1 Feb 2021 16:37:00 +0100 Message-Id: <20210201153700.618946-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" While pci_bus_realize() currently does not use the Error* argument, it would be an error to leave pcie_bus_realize() setting bus->flags if pci_bus_realize() had failed. Fix by using a local Error* and return early (propagating the error) if pci_bus_realize() failed. Reported-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé --- hw/pci/pci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 512e9042ffa..0d12e94a02e 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -130,8 +130,13 @@ static void pci_bus_realize(BusState *qbus, Error **errp) static void pcie_bus_realize(BusState *qbus, Error **errp) { PCIBus *bus = PCI_BUS(qbus); + Error *local_err = NULL; - pci_bus_realize(qbus, errp); + pci_bus_realize(qbus, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } /* * A PCI-E bus can support extended config space if it's the root