From nobody Wed Feb 5 11:49:35 2025 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1737023323; cv=none; d=zohomail.com; s=zohoarc; b=oFN2bxuR5bWezISjZLkSkQLBiZY/sF9M3mziv4NNL3HpHsf55dJMIDsQVNgug6rbqB9gjLQHHhBuWyuggL8AbrFuXxn5CLvcunA1BWXp2Tw4ocjjtovYf4GpAHQJKr+tHB6Gec2CjfCAOIt97z+/rQ5UdwjZ0b82q147ZtNE4zA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737023323; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kNUlTx/JUDytiTFedlk28EQ3cBww6LtXPJT611uQqBA=; b=Oj4I7Jjg4l66OCKvhiLdZWK78s3+tGuOOM9gkixxOj9Sh84uVEuNFyiw2ISi7PRkOpb0790U7Rt9CZQK6VGVDj8OXsRUZrPL7HuaiR8GazsXyutrbh3UAKVmd86gMVFAYgsyYSKNh3h3CoLwajwslHC+i/qd9t3wZoULXA8bKeY= 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 1737023323621926.2725642252725; Thu, 16 Jan 2025 02:28:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYN6P-00027v-8v; Thu, 16 Jan 2025 05:27:53 -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 1tYN6H-000275-QH for qemu-devel@nongnu.org; Thu, 16 Jan 2025 05:27:47 -0500 Received: from mgamail.intel.com ([192.198.163.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYN6F-0002lb-5e for qemu-devel@nongnu.org; Thu, 16 Jan 2025 05:27:45 -0500 Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2025 02:27:32 -0800 Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2025 02:27:30 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1737023263; x=1768559263; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PRUOhBzHcGIqfXPiUDXEC/acxL1CyLuVY8wILUvpSDs=; b=P2vlPEOIWtJgtT2FGaw8FQXTcFKPNTJ2+GhBJUNsCFgzzgtyhnv7RXb8 9/RdATR2/kk3+wT8pif3tGQYZUnQtxHeCpn4rJ5mGhqAYfP1XeU1ovhZ0 Kz/VzXxGtYOr29+FmyLBbejR3IuTty5bW0LY8kAvzo50+CkMVawxR3AFf Tw7ReSaS2DKwCheFJanmnKsI10MQb37XyHU94TazRqFpmsxu0CcGBsJ6K FKPxDvmnsnLzU7OHGapNXbHXxGoNHWBORa6reljT/rR6GgVAlOziNsQmo vGkXUR/ISAWw+LRJQavtpo6FEP4lZZhuhtnG9TxMClKmMjDc9yp3fXJ2b Q==; X-CSE-ConnectionGUID: RThZWeEvT7Ws68PShfm6rg== X-CSE-MsgGUID: 9XwDySOGRvmmxDerC89kLQ== X-IronPort-AV: E=McAfee;i="6700,10204,11314"; a="48816743" X-IronPort-AV: E=Sophos;i="6.12,310,1728975600"; d="scan'208";a="48816743" X-CSE-ConnectionGUID: UUZjsHmxQmq4u/uahRrI7A== X-CSE-MsgGUID: fuBoaYVcTdalVHvrNeHXMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="105300550" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, yi.l.liu@intel.com, chao.p.peng@intel.com, Zhenzhong Duan Subject: [PATCH] vfio/iommufd: Fix SIGSEV in iommufd_cdev_attach() Date: Thu, 16 Jan 2025 18:23:07 +0800 Message-Id: <20250116102307.260849-1-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 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: pass client-ip=192.198.163.10; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.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: 1737023325559019000 Content-Type: text/plain; charset="utf-8" When iommufd_cdev_ram_block_discard_disable() fails for whatever reason, errp should be set or else SIGSEV is triggered in vfio_realize() when error_prepend() is called. By this chance, use the same error message for both legacy and iommufd backend. Fixes: 5ee3dc7af785 ("vfio/iommufd: Implement the iommufd backend") Signed-off-by: Zhenzhong Duan Reviewed-by: Eric Auger --- hw/vfio/iommufd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index 3490a8f1eb..df61edffc0 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -515,8 +515,8 @@ static bool iommufd_cdev_attach(const char *name, VFIOD= evice *vbasedev, } else { ret =3D iommufd_cdev_ram_block_discard_disable(true); if (ret) { - error_setg(errp, - "Cannot set discarding of RAM broken (%d)", = ret); + error_setg_errno(errp, -ret, + "Cannot set discarding of RAM broken"); goto err_discard_disable; } goto found_container; @@ -544,6 +544,7 @@ static bool iommufd_cdev_attach(const char *name, VFIOD= evice *vbasedev, =20 ret =3D iommufd_cdev_ram_block_discard_disable(true); if (ret) { + error_setg_errno(errp, -ret, "Cannot set discarding of RAM broken"= ); goto err_discard_disable; } =20 --=20 2.34.1