From patchwork Sat Mar 9 19:21:44 2024 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: 779175 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp852974wrt; Sat, 9 Mar 2024 11:29:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUbqHWxXTcW1dkKzd/71+S+OQv2FNp8ehY4Z2Syf7q+bCWKKQMzVfAxDh+PKUGC0jUFXqOg1zK8ZYlJoH4nf/vl X-Google-Smtp-Source: AGHT+IH/Qj6WhMkYhkX21gezG6vk6p+mTucv4rYZX6CeY3I0Q/apwOzdcWNKf3CWUC9bwbLg5v3H X-Received: by 2002:a05:6358:468e:b0:17b:5c65:7f99 with SMTP id w14-20020a056358468e00b0017b5c657f99mr3213025rwl.1.1710012579069; Sat, 09 Mar 2024 11:29:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1710012579; cv=none; d=google.com; s=arc-20160816; b=m8ORkSysh2IktnKsn1Kp9z+9h6RM4M028hgmAkfyjg5p1/yzng0DYQJpxiKpaHnOkQ K9T1yYU9v+O+9G5Ib/z9q7+6BQRL8VRX9o6ysqpPeGy1hSKK0FhaRHxQAsBfa5b2ExW+ SNu+HX7huqKMe8hEC3A93Ao0YhXORf2ysR0P8cYlh/LXtEwTEtpVR48vKIagOco4Qoi6 lj8TTXsRJqEOyltsk0aq7z/EGkqRz4Kc7w7TxJdIy6XhSb0PNqVw1EH7VOZexme6NogZ 8DJB7biZEoC5aq2GuZdRPIvEarqN3QSUZH+fvTtUT5rLnEcP5wCUP9LWretJ0HQls+1t WJuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eUfL1w5ZY8ZGsSxKnH4ewPtSTSCallxtJeVJzhKEKHw=; fh=ShCaBC/RVtwi0ImYIFPfb6kLEQngTfmByX86FyahYA4=; b=RAcpiNENIB34TfOwzOG6pmax7rWs8f62I7i9FtenWHQeaYtc8nb/l7SpcqlCFamylJ qdd0n/+jBTq0i7S96A/viC5nORH4D+gmOLUoGLbn8fdPLymDGRQq1bPrDVepmXaSyYbi qR3f7vLfAuYGINRrY3xO0xlIeotolD80MpTE2led658H34qrLPzq73HYce6Bq+xgtoJ2 mpmyk6QI/PiP1P5GKm8aBxp8jjnlj370QY9AuT2eN/J9cSXgEBsn4P4lC/88iojE3G+n o0FmIPVdYPW9lINxwQzr7/fFX+OpzA7uDUWsGq4P2brQ8Q4kvvye9G6HBY7GOdkpfLqF n4jQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=phxrHw2B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f20-20020a05622a1a1400b0042edd2c7a15si2168268qtb.146.2024.03.09.11.29.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Mar 2024 11:29:39 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=phxrHw2B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rj2Ie-0002DI-6b; Sat, 09 Mar 2024 14:24:04 -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 1rj2Ic-0002Ba-Re for qemu-devel@nongnu.org; Sat, 09 Mar 2024 14:24:02 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rj2Ia-0002gp-HN for qemu-devel@nongnu.org; Sat, 09 Mar 2024 14:24:02 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5684f95cc9bso25879a12.1 for ; Sat, 09 Mar 2024 11:24:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710012238; x=1710617038; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eUfL1w5ZY8ZGsSxKnH4ewPtSTSCallxtJeVJzhKEKHw=; b=phxrHw2BBwh2uFzWHY3uVG2xMA2LfJche52MECwKCXkFyzZZjOGMreejZ3ItqQxILI 4THaEuD/VGoiG+UbSgBcvh9t3H/lv3wYUMLlc+Ajg1XZDLt+XZfBHAwOfnPPffIA8fi+ s8405NdGqj3dF/hnV9qxuGdFKrSPl3FhsNKt6xbeneVHv/ii6yyt137JOC4XjKRcwCP0 L5d5M4hFiyk4VXWZWLKWzyvpDhKr5D83hnWj0DFzqSL1lUqXy4sDE5fghG+36PKakcq0 YiQsxsmg7eWHf+m/ihCmBm537rq3f73VRWAAAbZdJ5CX/kJSlXp5pW0KDnpuaKPQNKRl oCFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710012238; x=1710617038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eUfL1w5ZY8ZGsSxKnH4ewPtSTSCallxtJeVJzhKEKHw=; b=cZw12KB2Dk0Va041J+yhGhODXp74iOj3XsklwyX0levlDCacL8Se18UO7PpKdWiYQz 9H1FqKIAlCPp9SkdV50oa2Ff4vUDi/1Jcu7PzIoMJI7Rgg99MIKPX15rrFulLTKBjpkO oY9IhCbFQ+9tsVOASMbwVPApwyAs5HIk3ek4QkwFJtis4Dx+TEOGkMJnxMtkvirvNNgv eGBsEMr+BdCHOmXASticgGrQe7xR4vR9FARPAqvguQSrztixf7cu2OXwbV2sxxr5eJVV PwkxCTjzdAE5obx7uDINLBeMLeoRnaZCzYfjSJcF/d1ofcrKYlfj7C/UCOu3n0KA+YQO PJVA== X-Gm-Message-State: AOJu0Yw72CvWtI6+UjeiTzPX3/UoOIa3I8cingQzTyCtdq5PBFKCD/Hx N+pf+3ocYovxgCH+dzXrBdXM7UeJ84AOmo4ey4eFM7RbhaYdPO3K/E2oSHkMdvZL0sCvrbOmjRF 4 X-Received: by 2002:a50:8ad9:0:b0:566:1952:afc4 with SMTP id k25-20020a508ad9000000b005661952afc4mr3675368edk.6.1710012238657; Sat, 09 Mar 2024 11:23:58 -0800 (PST) Received: from m1x-phil.lan ([176.176.181.237]) by smtp.gmail.com with ESMTPSA id et8-20020a056402378800b00566a4dec01fsm1154716edb.11.2024.03.09.11.23.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 09 Mar 2024 11:23:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, Zhao Liu , Elena Ufimtseva , Jagannathan Raman , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 17/43] hw/remote/remote-obj: hw/misc/ivshmem: Fix missing ERRP_GUARD() for error_prepend() Date: Sat, 9 Mar 2024 20:21:44 +0100 Message-ID: <20240309192213.23420-18-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240309192213.23420-1-philmd@linaro.org> References: <20240309192213.23420-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=philmd@linaro.org; helo=mail-ed1-x52a.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhao Liu As the comment in qapi/error, passing @errp to error_prepend() requires ERRP_GUARD(): * = Why, when and how to use ERRP_GUARD() = * * Without ERRP_GUARD(), use of the @errp parameter is restricted: ... * - It should not be passed to error_prepend(), error_vprepend() 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. ERRP_GUARD() could avoid the case when @errp is the pointer of error_fatal, the user can't see this additional information, because exit() happens in error_setg earlier than information is added [1]. The remote_object_set_fd() passes @errp to error_prepend(), and as a PropertyInfo.set method, its @errp is so widely sourced that it is necessary to protect it with ERRP_GUARD(). To avoid the issue like [1] said, add missing ERRP_GUARD() at the beginning of this function. [1]: Issue description in the commit message of commit ae7c80a7bd73 ("error: New macro ERRP_GUARD()"). Cc: Elena Ufimtseva Cc: Jagannathan Raman Signed-off-by: Zhao Liu Reviewed-by: Thomas Huth Message-ID: <20240229143914.1977550-4-zhao1.liu@linux.intel.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/remote/remote-obj.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c index 65b6f7cc86..dc27cc8da1 100644 --- a/hw/remote/remote-obj.c +++ b/hw/remote/remote-obj.c @@ -49,6 +49,7 @@ struct RemoteObject { static void remote_object_set_fd(Object *obj, const char *str, Error **errp) { + ERRP_GUARD(); RemoteObject *o = REMOTE_OBJECT(obj); int fd = -1;