From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1rfl48-0005BW-NN for mharc-qemu-trivial@gnu.org; Thu, 29 Feb 2024 13:23:32 -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 1rfl47-00058Y-Rb for qemu-trivial@nongnu.org; Thu, 29 Feb 2024 13:23:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfl45-0003wC-1g for qemu-trivial@nongnu.org; Thu, 29 Feb 2024 13:23:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709231008; 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=qastcp8CQGXthHZuPdOFfJywS2j1TI3CPTiTjAPpUq0=; b=NVbwEHf39R3SpWlfrPHcOGV8Gpp7zcMDfAwE6dSTiTnPBbuzMVT13l0+VEQwHQpPLwwfbe bgYh37Vfoey9E2DwuboxfMZLf1f+lfxLOZSOFtuS8rjP+4uX6E6m7JwIBYWBcF7J7sA8rr n2572H/bvC9aKB1aG6vl5j8l2JxecdY= Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-588-3Z-yAj0MMTGIDWugnFyjaA-1; Thu, 29 Feb 2024 13:23:27 -0500 X-MC-Unique: 3Z-yAj0MMTGIDWugnFyjaA-1 Received: by mail-oo1-f69.google.com with SMTP id 006d021491bc7-5a05537c0b3so1113174eaf.1 for ; Thu, 29 Feb 2024 10:23:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709231006; x=1709835806; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qastcp8CQGXthHZuPdOFfJywS2j1TI3CPTiTjAPpUq0=; b=lld/ijTNRL/3djK0OKRlLsAKE2g69s+OvEX2J+FM1O1A7+wfOms3HSYpDPbsssIrUE SuRQmG/v9y34MdjkHeYJSo8hFkWGWWbIWTgk5etWCEaGrd3NvVyOpCr5KyxWx5yNkbjy j7d6DgfW1G9OS+1ZZXmc4qUW4Vr7fu6Iu9VefNlBjcCyT3W5uNaWLvTDM2P//E/ZLxMU W6famKqEdDVlC6A8ClPBb0JbBEUsYT1sqqgyMC2/0+qmRnpGYhoRo/ee1pIz9U94dYXH pCzTp94UmpiGoCfON5vtraRQ1stZe0Vq/U/fMk73GVQZvCgd+EG8XxKRmotDCzB3IPog mwRA== X-Gm-Message-State: AOJu0Yx9vvBTdjAmDmjGTJZ3SCvSRZDrLjAzOdaKB/skGvBG3KAJdl+L ckegz9enG2298vzvk2KZ8i2NIatFU3hqU2LYGVNMRiert915XTWnezJf92BoUSgkhaxO9J5g5qG fmcKHQIqOPURHwFS++m8kK2LsiPf9ilaYScE5Zpj5Hm+ZLA+sqH9K+08= X-Received: by 2002:a05:6358:7e85:b0:17b:b830:2809 with SMTP id o5-20020a0563587e8500b0017bb8302809mr3618431rwn.19.1709231006302; Thu, 29 Feb 2024 10:23:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IEBmcvqtDdbJG2GiWKBOMOx9PjmZCYsFOJbH35xdHtSvRX5Q/EAL6eZObabWPj6FVjgY8PgCw== X-Received: by 2002:a05:6358:7e85:b0:17b:b830:2809 with SMTP id o5-20020a0563587e8500b0017bb8302809mr3618410rwn.19.1709231006007; Thu, 29 Feb 2024 10:23:26 -0800 (PST) Received: from ?IPV6:2a01:e0a:280:24f0:9db0:474c:ff43:9f5c? ([2a01:e0a:280:24f0:9db0:474c:ff43:9f5c]) by smtp.gmail.com with ESMTPSA id qp11-20020a056214598b00b0068fef74fdb3sm994819qvb.59.2024.02.29.10.23.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Feb 2024 10:23:25 -0800 (PST) Message-ID: Date: Thu, 29 Feb 2024 19:23:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 08/17] hw/vfio/iommufd: Fix missing ERRP_GUARD() for error_prepend() To: Zhao Liu , Markus Armbruster , Michael Roth , Michael Tokarev , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Zhao Liu , Alex Williamson References: <20240229143914.1977550-1-zhao1.liu@linux.intel.com> <20240229143914.1977550-9-zhao1.liu@linux.intel.com> From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: <20240229143914.1977550-9-zhao1.liu@linux.intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US, fr Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.096, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Feb 2024 18:23:32 -0000 On 2/29/24 15:39, Zhao Liu wrote: > 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 iommufd_cdev_getfd() passes @errp to error_prepend(). Its @errp is > from vfio_attach_device(), which @errp parameter 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: Alex Williamson > Cc: "Cédric Le Goater" > Signed-off-by: Zhao Liu Reviewed-by: Cédric Le Goater Thanks, C. > --- > hw/vfio/iommufd.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c > index 9bfddc136089..7baf49e6ee9e 100644 > --- a/hw/vfio/iommufd.c > +++ b/hw/vfio/iommufd.c > @@ -116,6 +116,7 @@ static void iommufd_cdev_unbind_and_disconnect(VFIODevice *vbasedev) > > static int iommufd_cdev_getfd(const char *sysfs_path, Error **errp) > { > + ERRP_GUARD(); > long int ret = -ENOTTY; > char *path, *vfio_dev_path = NULL, *vfio_path = NULL; > DIR *dir = NULL;