From nobody Tue Nov 26 11:44:10 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=1708530100; cv=none; d=zohomail.com; s=zohoarc; b=McaZJDaTbQTifBAsFL844T7Szr23CFeazrpJmEpa9an3+7uS7NdSA+glPRO4ympMJZIGm0q2PhyBPffGxCAArxLmfWIfgNjVD3Nu4CHrtUaEOFGG2ZJlF3fHi5JTSrwkm9dcMjqdEjzbHOp8sA8x1NjhLBe+9ypYujwPytkVkRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708530100; 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=CWY3AODcPZ/mJR1gPRXK4lRP7kdKfdVRNBl62maq5HA=; b=hPR32TC/+W2v/e0mRef1STdzK3aZytXm+RmZvCvFm6cqaTeF+tVeQH94fB8O9xXQnYk0b83W6FxaNs9N2JcdpfceN5C0tEBJ6FG/hDLNSP2fWXeWWWbOndBGLYWVL22dzF/d1qRwvFw0A+XNjM9L4GJpJmwKSPq9GJBuvvfZla8= 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 1708530100860282.73449037031537; Wed, 21 Feb 2024 07:41:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcoai-0001XH-9L; Wed, 21 Feb 2024 10:33:00 -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 1rcoU4-0000na-As; Wed, 21 Feb 2024 10:26:08 -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 1rciva-0003SO-LJ; Wed, 21 Feb 2024 04:30:15 -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:01 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orviesa003.jf.intel.com with ESMTP; 21 Feb 2024 01:29:57 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708507811; x=1740043811; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9Bc0Ckt/w+D5ioixCAtTbsd0rswmbrxmghE0DuhNEmw=; b=kFbLR8zrVVXmHGHwV5+hTaFMQaaWx05EVkp8t1Csj8md1O8lOvY2/LVx 5tWSS087VY3GZathzuDDWnGcSCnhaaXY3otU7VN10VZPR8gpN80XTf7Fs SZziDZOZMK0L5TVqBqH29PApE4NK22FePCaLWaeprhRC4+dCvO/OtMIOR IZFjZW97F9NvYIdJFVslyyuVgybAi5WVMn+l/CMj7TVbaOGDF/ljfoQGs l5GxqPYZNJGpH1CVVIiBgnMfQeafVEDPskAnGVwHRW9HbckYsTba4jyhl geXqTwOXfXg8M9XzP4Q83XHn9kPW8ODcsB3zMkKkN0MfkUQlAazq7Qs4m w==; X-IronPort-AV: E=McAfee;i="6600,9927,10990"; a="2795468" X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="2795468" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,175,1705392000"; d="scan'208";a="9720087" 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 4/6] hw/misc/xlnx-versal-trng: Fix missing ERRP_GUARD() in trng_prop_fault_event_set() Date: Wed, 21 Feb 2024 17:43:15 +0800 Message-Id: <20240221094317.994454-5-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-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: 1708530102322100009 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 trng_prop_fault_event_set() doesn't get the NULL errp parameter as a "set" method of object property, it doesn't trigger the dereference issue. To follow the requirement of errp, add missing ERRP_GUARD() in trng_prop_fault_event_set(). Suggested-by: Markus Armbruster Signed-off-by: Zhao Liu --- Suggested by credit: Markus: Referred his explanation about ERRP_GUARD(). --- hw/misc/xlnx-versal-trng.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c index b8111b8b6626..3579348a9d17 100644 --- a/hw/misc/xlnx-versal-trng.c +++ b/hw/misc/xlnx-versal-trng.c @@ -33,6 +33,7 @@ #include "qemu/error-report.h" #include "qemu/guest-random.h" #include "qemu/timer.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" @@ -641,6 +642,7 @@ static void trng_prop_fault_event_set(Object *obj, Visi= tor *v, const char *name, void *opaque, Error **errp) { + ERRP_GUARD(); Property *prop =3D opaque; uint32_t *events =3D object_field_prop_ptr(obj, prop); =20 --=20 2.34.1