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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 DA672C433B4 for ; Wed, 21 Apr 2021 15:51:58 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CB82B6144C for ; Wed, 21 Apr 2021 15:51:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB82B6144C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=emlix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 73BA440EEA; Wed, 21 Apr 2021 15:51:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ltofHsJn9siM; Wed, 21 Apr 2021 15:51:56 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTP id 39F9B40EC4; Wed, 21 Apr 2021 15:51:56 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1ADC0C000F; Wed, 21 Apr 2021 15:51:56 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 46DADC000B for ; Wed, 21 Apr 2021 15:21:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 286B260BD8 for ; Wed, 21 Apr 2021 15:21:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D6mwN58xlX_U for ; Wed, 21 Apr 2021 15:21:19 +0000 (UTC) X-Greylist: delayed 00:08:35 by SQLgrey-1.8.0 Received: from mx1.emlix.com (mx1.emlix.com [136.243.223.33]) by smtp3.osuosl.org (Postfix) with ESMTPS id B549160B83 for ; Wed, 21 Apr 2021 15:21:19 +0000 (UTC) Received: from mailer.emlix.com (p5098be52.dip0.t-ipconnect.de [80.152.190.82]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id 465176078C; Wed, 21 Apr 2021 17:12:42 +0200 (CEST) From: Rolf Eike Beer To: Joerg Roedel , Will Deacon Subject: [PATCH] Intel IOMMU: fix sysfs leak in hotplug init path Date: Wed, 21 Apr 2021 17:12:41 +0200 Message-ID: <1716403.SmlLz2RZUD@devpool47> Organization: emlix GmbH MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 21 Apr 2021 15:51:54 +0000 Cc: iommu@lists.linux-foundation.org, David Woodhouse , linux-kernel@vger.kernel.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" U2lnbmVkLW9mZi1ieTogUm9sZiBFaWtlIEJlZXIgPGViQGVtbGl4LmNvbT4KLS0tCiBkcml2ZXJz L2lvbW11L2ludGVsL2RtYXIuYyB8IDQgKysrLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9u cygrKSwgMSBkZWxldGlvbigtKQoKSSBoYXZlIG5vdCBhY3R1YWxseSB0ZXN0ZWQgdGhpcyBidXQg SSBndWVzcyBpdCBzaG91bGQgbWF0Y2ggdGhlIGNvZGUgaW4gCmZyZWVfaW9tbXUoKSBqdXN0IGJl bG93LgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW9tbXUvaW50ZWwvZG1hci5jIGIvZHJpdmVycy9p b21tdS9pbnRlbC9kbWFyLmMKaW5kZXggZDVjNTFiNWMyMGFmLi5mYjM3YTliNzliM2EgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvaW9tbXUvaW50ZWwvZG1hci5jCisrKyBiL2RyaXZlcnMvaW9tbXUvaW50 ZWwvZG1hci5jCkBAIC0xMTQ0LDcgKzExNDQsNyBAQCBzdGF0aWMgaW50IGFsbG9jX2lvbW11KHN0 cnVjdCBkbWFyX2RyaGRfdW5pdCAqZHJoZCkKIAogCQllcnIgPSBpb21tdV9kZXZpY2VfcmVnaXN0 ZXIoJmlvbW11LT5pb21tdSk7CiAJCWlmIChlcnIpCi0JCQlnb3RvIGVycl91bm1hcDsKKwkJCWdv dG8gZXJyX3VucmVnaXN0ZXI7CiAJfQogCiAJZHJoZC0+aW9tbXUgPSBpb21tdTsKQEAgLTExNTIs NiArMTE1Miw4IEBAIHN0YXRpYyBpbnQgYWxsb2NfaW9tbXUoc3RydWN0IGRtYXJfZHJoZF91bml0 ICpkcmhkKQogCiAJcmV0dXJuIDA7CiAKK2Vycl91bnJlZ2lzdGVyOgorCWlvbW11X2RldmljZV9z eXNmc19yZW1vdmUoJmlvbW11LT5pb21tdSk7CiBlcnJfdW5tYXA6CiAJdW5tYXBfaW9tbXUoaW9t bXUpOwogZXJyb3JfZnJlZV9zZXFfaWQ6Ci0tIAoyLjMxLjEKCgotLSAKUm9sZiBFaWtlIEJlZXIs IGVtbGl4IEdtYkgsIGh0dHA6Ly93d3cuZW1saXguY29tCkZvbiArNDkgNTUxIDMwNjY0LTAsIEZh eCArNDkgNTUxIDMwNjY0LTExCkdvdGhhZXIgUGxhdHogMywgMzcwODMgR8O2dHRpbmdlbiwgR2Vy bWFueQpTaXR6IGRlciBHZXNlbGxzY2hhZnQ6IEfDtnR0aW5nZW4sIEFtdHNnZXJpY2h0IEfDtnR0 aW5nZW4gSFIgQiAzMTYwCkdlc2Now6RmdHNmw7xocnVuZzogSGVpa2UgSm9yZGFuLCBEci4gVXdl IEtyYWNrZSDigJMgVXN0LUlkTnIuOiBERSAyMDUgMTk4IDA1NQoKZW1saXggLSBzbWFydCBlbWJl ZGRlZCBvcGVuIHNvdXJjZQoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwppb21tdSBtYWlsaW5nIGxpc3QKaW9tbXVAbGlzdHMubGludXgtZm91bmRhdGlv bi5vcmcKaHR0cHM6Ly9saXN0cy5saW51eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8v aW9tbXU= 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 6C89AC433ED for ; Wed, 21 Apr 2021 15:12:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4113B6144D for ; Wed, 21 Apr 2021 15:12:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243873AbhDUPNS convert rfc822-to-8bit (ORCPT ); Wed, 21 Apr 2021 11:13:18 -0400 Received: from mx1.emlix.com ([136.243.223.33]:33072 "EHLO mx1.emlix.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240356AbhDUPNR (ORCPT ); Wed, 21 Apr 2021 11:13:17 -0400 Received: from mailer.emlix.com (p5098be52.dip0.t-ipconnect.de [80.152.190.82]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id 465176078C; Wed, 21 Apr 2021 17:12:42 +0200 (CEST) From: Rolf Eike Beer To: Joerg Roedel , Will Deacon Cc: David Woodhouse , Lu Baolu , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] Intel IOMMU: fix sysfs leak in hotplug init path Date: Wed, 21 Apr 2021 17:12:41 +0200 Message-ID: <1716403.SmlLz2RZUD@devpool47> Organization: emlix GmbH MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Rolf Eike Beer --- drivers/iommu/intel/dmar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) I have not actually tested this but I guess it should match the code in free_iommu() just below. diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c index d5c51b5c20af..fb37a9b79b3a 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_unregister; } drhd->iommu = iommu; @@ -1152,6 +1152,8 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) return 0; +err_unregister: + iommu_device_sysfs_remove(&iommu->iommu); err_unmap: unmap_iommu(iommu); error_free_seq_id: -- 2.31.1 -- Rolf Eike Beer, emlix GmbH, http://www.emlix.com Fon +49 551 30664-0, Fax +49 551 30664-11 Gothaer Platz 3, 37083 Göttingen, Germany Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160 Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055 emlix - smart embedded open source