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=-16.4 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 6FD0DC433DB for ; Sun, 3 Jan 2021 02:40:17 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 DA4BB207A5 for ; Sun, 3 Jan 2021 02:40:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA4BB207A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.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 hemlock.osuosl.org (Postfix) with ESMTP id 776FB86FD8; Sun, 3 Jan 2021 02:40:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TTKIo1P0txQK; Sun, 3 Jan 2021 02:40:15 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 715DF86FB6; Sun, 3 Jan 2021 02:40:15 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 49A26C0174; Sun, 3 Jan 2021 02:40:15 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 31DB1C013A for ; Sun, 3 Jan 2021 02:40:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0E24D203CD for ; Sun, 3 Jan 2021 02:40:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kKtJYYCMrANb for ; Sun, 3 Jan 2021 02:40:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by silver.osuosl.org (Postfix) with ESMTPS id AEC272013C for ; Sun, 3 Jan 2021 02:40:11 +0000 (UTC) IronPort-SDR: zoUWPEQLDefq//TOLRk0oMleYy2mFwY2nD4aH6S58cyQ6y50gKZc58JHEdPFqNnUml10FQt4QR zENm0KK+SoYg== X-IronPort-AV: E=McAfee;i="6000,8403,9852"; a="156040973" X-IronPort-AV: E=Sophos;i="5.78,470,1599548400"; d="scan'208";a="156040973" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jan 2021 18:40:11 -0800 IronPort-SDR: P+etS6HLK4+UjGSY7334oDp07VxB1Xm/gJX+SVuH5+ytpFsKZdT0MEYg0sVVsDOnInXX5ZB8gK I1Qey11Nbz4Q== X-IronPort-AV: E=Sophos;i="5.78,470,1599548400"; d="scan'208";a="377852225" Received: from blu2-mobl3.ccr.corp.intel.com (HELO [10.255.29.85]) ([10.255.29.85]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jan 2021 18:40:08 -0800 Subject: Re: [PATCH] iommu/intel: Fix memleak in intel_irq_remapping_alloc To: Dinghao Liu , kjlu@umn.edu References: <20210102095029.29053-1-dinghao.liu@zju.edu.cn> From: Lu Baolu Message-ID: <18add30d-a830-c531-6fd2-58a1898b157f@linux.intel.com> Date: Sun, 3 Jan 2021 10:40:06 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210102095029.29053-1-dinghao.liu@zju.edu.cn> Content-Language: en-US Cc: David Woodhouse , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Thomas Gleixner , Will Deacon , Jiang Liu 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Hi, On 2021/1/2 17:50, Dinghao Liu wrote: > When irq_domain_get_irq_data() or irqd_cfg() fails > meanwhile i == 0, data allocated by kzalloc() has not > been freed before returning, which leads to memleak. > > Fixes: b106ee63abccb ("irq_remapping/vt-d: Enhance Intel IR driver to support hierarchical irqdomains") > Signed-off-by: Dinghao Liu > --- > drivers/iommu/intel/irq_remapping.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c > index aeffda92b10b..cdaeed36750f 100644 > --- a/drivers/iommu/intel/irq_remapping.c > +++ b/drivers/iommu/intel/irq_remapping.c > @@ -1354,6 +1354,8 @@ static int intel_irq_remapping_alloc(struct irq_domain *domain, > irq_cfg = irqd_cfg(irq_data); > if (!irq_data || !irq_cfg) { > ret = -EINVAL; > + kfree(data); > + data = NULL; Do you need to check (i == 0) here? @data will not be used anymore as it goes to out branch, why setting it to NULL here? Best regards, baolu > goto out_free_data; > } > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu