From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00104C433B4 for ; Thu, 22 Apr 2021 05:44:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE7CB61457 for ; Thu, 22 Apr 2021 05:44:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231631AbhDVFok (ORCPT ); Thu, 22 Apr 2021 01:44:40 -0400 Received: from mga12.intel.com ([192.55.52.136]:64172 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbhDVFoh (ORCPT ); Thu, 22 Apr 2021 01:44:37 -0400 IronPort-SDR: xV1Z3RRjb/WtKFEihkvzfET9UYE1juTKwtFIM3ZLYUJlYV6HvbaU4SwMfc44pe5p3lRu0Ynwqd 9XlJHZ8eY7Fg== X-IronPort-AV: E=McAfee;i="6200,9189,9961"; a="175316669" X-IronPort-AV: E=Sophos;i="5.82,241,1613462400"; d="scan'208";a="175316669" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2021 22:44:03 -0700 IronPort-SDR: OiZdGW1Av586D5MrQvzGUrwiUhBfctjZwZ/+Pyckqj1gLR1228+nK0/UXRuR0T+h8rBfd6fxWF Px7Xo04WsKZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,241,1613462400"; d="scan'208";a="524527974" Received: from allen-box.sh.intel.com (HELO [10.239.159.128]) ([10.239.159.128]) by fmsmga001.fm.intel.com with ESMTP; 21 Apr 2021 22:44:01 -0700 Cc: baolu.lu@linux.intel.com, David Woodhouse , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] iommu/vt-d: Fix sysfs leak in alloc_domain() To: Rolf Eike Beer , Joerg Roedel , Will Deacon References: <1716403.SmlLz2RZUD@devpool47> <17411490.HIIP88n32C@mobilepool36.emlix.com> From: Lu Baolu Message-ID: Date: Thu, 22 Apr 2021 13:34:17 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <17411490.HIIP88n32C@mobilepool36.emlix.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rolf, On 4/22/21 1:39 PM, Rolf Eike Beer wrote: > iommu_device_sysfs_add() is called before, so is has to be cleaned on subsequent > errors. > > Fixes: 39ab9555c2411 ("iommu: Add sysfs bindings for struct iommu_device") > Cc: stable@vger.kernel.org # 4.11.x > Signed-off-by: Rolf Eike Beer Acked-by: Lu Baolu P.S. Next time when you submit a new version, please use a version tag. Best regards, baolu > --- > drivers/iommu/intel/dmar.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c > index d5c51b5c20af..c2bfccb19e24 100644 > --- a/drivers/iommu/intel/dmar.c > +++ b/drivers/iommu/intel/dmar.c > @@ -1144,7 +1144,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) > > err = iommu_device_register(&iommu->iommu); > if (err) > - goto err_unmap; > + goto err_sysfs; > } > > drhd->iommu = iommu; > @@ -1152,6 +1152,8 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) > > return 0; > > +err_sysfs: > + iommu_device_sysfs_remove(&iommu->iommu); > err_unmap: > unmap_iommu(iommu); > error_free_seq_id: >