From nobody Tue Nov 26 11:45:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1708529963; cv=none; d=zohomail.com; s=zohoarc; b=k8P0tJOCDWu4uMEXXPRqQWDK3YyfuuEVTKA4EFtwdJx0LFqTSkxdp8QmhnNnloNxVTkhmhqpxXJE6LI2cFPbxiXoeY3bgx+4YP54b51Lcxx3Kd/3p29akoKHCbqjQA10rGoDip+8CLnqOoOiFrNPXaNunBwpdYXXGwvi/QJu+Zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708529963; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DCGAgsSgyIyU7jOfmdUwEVmKd4IeUjaf5it2yyHq5yU=; b=gIUUMXVTkYw7zt/8Rc7+NrtkGYBIAav7zl5YdVlwFb/PTQw4NkArVneDNfh8kKazOsSWXA/SskKg+rxKtXpK7JQcrfYispUrSTp499NgHrmntYSqgdPiO6M9iVjW6W/OQyiHeFSg+puH6OEl02SnG/PosRb96QQ16AiDc6Q6JbM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1708529963786174.44250783557413; Wed, 21 Feb 2024 07:39:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcoOx-0004P0-NN; Wed, 21 Feb 2024 10:20:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcoL4-0000wC-Jq; Wed, 21 Feb 2024 10:16:52 -0500 Received: from mgamail.intel.com ([192.198.163.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcivZ-0003dX-FC; Wed, 21 Feb 2024 04:30:20 -0500 Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2024 01:30:05 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orviesa003.jf.intel.com with ESMTP; 21 Feb 2024 01:30:01 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708507810; x=1740043810; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2YsbLPL6v1xok/8Kc8flnuoxreDppreVjYDnHHeyris=; b=Yfay+RoJn4xf7Uqghcitv/0NrPGwqS3pe2gclIHoiu8BbKU4ssOcL6Ar mT2IOokXv3BKM1pMpoge/yL6v15mR5no8XVVvDPQyyWmcZFAobDIXE4yv g3q5K3YHam8P10XxoEZpbYdymTlQpD1QY3sSABDKiwwHbs0rTovXC48vl RRn4BeiBwHmsJpFLqagkrnQ3sv6377q3Bj4gRHmmZZkkNOCAKtMupmAVF NI1FVJS0iFyJYV/osjOtvTxSn0zZACrRMBv5i7KiC2UGe7xe4GnWVQjF7 BjxKJx+beTRTbjaENkd1WW2fNogI06QUAxk9x50GDVdsJlglZgavwHkFw w==; X-IronPort-AV: E=McAfee;i="6600,9927,10990"; a="2795502" X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="2795502" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="9720155" From: Zhao Liu To: Jonathan Cameron , Fan Ni , Laurent Vivier , Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , "Michael S . Tsirkin" , Marcel Apfelbaum , Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-trivial@nongnu.org, Zhao Liu Subject: [PATCH 5/6] hw/pci-bridge/cxl_upstream: Fix missing ERRP_GUARD() in cxl_usp_realize() Date: Wed, 21 Feb 2024 17:43:16 +0800 Message-Id: <20240221094317.994454-6-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240221094317.994454-1-zhao1.liu@linux.intel.com> References: <20240221094317.994454-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 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: none client-ip=192.198.163.15; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.05, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1708529964714100005 Content-Type: text/plain; charset="utf-8" From: Zhao Liu As the comment in qapi/error, dereferencing @errp requires ERRP_GUARD(): * =3D Why, when and how to use ERRP_GUARD() =3D * * Without ERRP_GUARD(), use of the @errp parameter is restricted: * - It must not be dereferenced, because it may be null. * - It should not be passed to error_prepend() or * error_append_hint(), because that doesn't work with &error_fatal. * ERRP_GUARD() lifts these restrictions. * * To use ERRP_GUARD(), add it right at the beginning of the function. * @errp can then be used without worrying about the argument being * NULL or &error_fatal. * * Using it when it's not needed is safe, but please avoid cluttering * the source with useless code. Currently, since cxl_usp_realize() - as a PCIDeviceClass.realize() method - doesn't get the NULL errp parameter, it doesn't trigger the dereference issue. To follow the requirement of errp, add missing ERRP_GUARD() in cxl_usp_realize()(). Suggested-by: Markus Armbruster Signed-off-by: Zhao Liu Acked-by: Jonathan Cameron Reviewed-by: Markus Armbruster --- Suggested by credit: Markus: Referred his explanation about ERRP_GUARD(). --- hw/pci-bridge/cxl_upstream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c index e87eb4017713..03d123cca0ef 100644 --- a/hw/pci-bridge/cxl_upstream.c +++ b/hw/pci-bridge/cxl_upstream.c @@ -289,6 +289,7 @@ static void free_default_cdat_table(CDATSubHeader **cda= t_table, int num, =20 static void cxl_usp_realize(PCIDevice *d, Error **errp) { + ERRP_GUARD(); PCIEPort *p =3D PCIE_PORT(d); CXLUpstreamPort *usp =3D CXL_USP(d); CXLComponentState *cxl_cstate =3D &usp->cxl_cstate; --=20 2.34.1