Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1509420ybb; Sat, 11 Apr 2020 05:16:47 -0700 (PDT) X-Google-Smtp-Source: APiQypJ/REQsrOEUQMyO8dqgiMOYzvxNGKCGS3Gx2weD9XV6E5EHJyxBRfywjfX+TeDqh2HCVkC/ X-Received: by 2002:a37:a116:: with SMTP id k22mr1317578qke.99.1586607407661; Sat, 11 Apr 2020 05:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586607407; cv=none; d=google.com; s=arc-20160816; b=cgITVvjg+iDmrxxl2K9AtuksOpK08Z12U1C3hPmcg0wcPVlzDYtPJ6NLyaxI08y4/h QjACRLTzrGe9s0k0XLRq874AfzVaUgoPIuMsFeuv1HNGn1oW2ax2KQfaigqDjMbqvrKT uAeLWiAFvASgOOvIdcSxf41UIF6P/aqAbEzPenutNx3SLAloyz7+6eYVa2R8lAIuCUA7 6Zt1AN0fK4mkxzj3dIkuCbYUBuKwMv4FtxsdZG3br5XqQEF2cmLtAw2kAGRLOZFh5cMt 2kP0tPeILmWYUI2N5u+sthvQTHc47iSuBfarwyEZ+yTROTxUbV9yJIq9cnezw49kTyrE x6Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Hzbe2iwlBbOIR2tLJeFYLKLTnlKVxcB/ypdr6VV0G2E=; b=gIBb6y5zmU39ZAVU0PLj2U22rdVx3KJix+xxchD1lw4E908sp7efCec87wbp6CBG0J o7e2bNal/GXBLTYWQ0IWud4EnITDWRsx0dgn+9CQXYYcmt7syn8Ai4DDodL6/Reobtij UBC9/qoclsZ1nzuUQOPIfJFnpmzLB2xLs1sBjiL26OtqwVdiQkXbLhTKOJYOOWJx+lVc ub0ag494DW8fAqKpKM1ZxHwao2+S/LFzH4Wi4i0yx+0GxjaOnG8cq2PBegW01P6/DBnj 77aglGxZ8hcQzl0x6lWu6U9/3rfJOGlzT9jTWuD+hTe5MYtC5TTQvNBJRcv/oH6VK1yH tlQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Htw6t2qu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f13si45873qkh.225.2020.04.11.05.16.33; Sat, 11 Apr 2020 05:16:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Htw6t2qu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728232AbgDKMQB (ORCPT + 99 others); Sat, 11 Apr 2020 08:16:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:50148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728222AbgDKMP7 (ORCPT ); Sat, 11 Apr 2020 08:15:59 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 88EF520787; Sat, 11 Apr 2020 12:15:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586607359; bh=9/F1HgN1yJlGKSkllksxsM4rLDTTAM51nN0ITD+mQ4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Htw6t2qu9PYhmekiuW2t2rdqtu1t83oMGRDWEl3is8X3MZZhFyOqBDEi3Nvg2GcsI CgjT6UcmAwuEKIscYfWSFz0ceVvhUPn5NtqBIsvpLiKWRW2+JAY1pbLRvDOK8ZQnK1 QKqeuiFO/X2Q0UIJDYy7PJZKANDutXQzvi9PiRQ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mike Marciniszyn , Kaike Wan , Dennis Dalessandro , Jason Gunthorpe Subject: [PATCH 4.19 41/54] IB/hfi1: Fix memory leaks in sysfs registration and unregistration Date: Sat, 11 Apr 2020 14:09:23 +0200 Message-Id: <20200411115512.696605410@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200411115508.284500414@linuxfoundation.org> References: <20200411115508.284500414@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kaike Wan commit 5c15abc4328ad696fa61e2f3604918ed0c207755 upstream. When the hfi1 driver is unloaded, kmemleak will report the following issue: unreferenced object 0xffff8888461a4c08 (size 8): comm "kworker/0:0", pid 5, jiffies 4298601264 (age 2047.134s) hex dump (first 8 bytes): 73 64 6d 61 30 00 ff ff sdma0... backtrace: [<00000000311a6ef5>] kvasprintf+0x62/0xd0 [<00000000ade94d9f>] kobject_set_name_vargs+0x1c/0x90 [<0000000060657dbb>] kobject_init_and_add+0x5d/0xb0 [<00000000346fe72b>] 0xffffffffa0c5ecba [<000000006cfc5819>] 0xffffffffa0c866b9 [<0000000031c65580>] 0xffffffffa0c38e87 [<00000000e9739b3f>] local_pci_probe+0x41/0x80 [<000000006c69911d>] work_for_cpu_fn+0x16/0x20 [<00000000601267b5>] process_one_work+0x171/0x380 [<0000000049a0eefa>] worker_thread+0x1d1/0x3f0 [<00000000909cf2b9>] kthread+0xf8/0x130 [<0000000058f5f874>] ret_from_fork+0x35/0x40 This patch fixes the issue by: - Releasing dd->per_sdma[i].kobject in hfi1_unregister_sysfs(). - This will fix the memory leak. - Calling kobject_put() to unwind operations only for those entries in dd->per_sdma[] whose operations have succeeded (including the current one that has just failed) in hfi1_verbs_register_sysfs(). Cc: Fixes: 0cb2aa690c7e ("IB/hfi1: Add sysfs interface for affinity setup") Link: https://lore.kernel.org/r/20200326163807.21129.27371.stgit@awfm-01.aw.intel.com Reviewed-by: Mike Marciniszyn Signed-off-by: Kaike Wan Signed-off-by: Dennis Dalessandro Signed-off-by: Jason Gunthorpe Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/hw/hfi1/sysfs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) --- a/drivers/infiniband/hw/hfi1/sysfs.c +++ b/drivers/infiniband/hw/hfi1/sysfs.c @@ -861,8 +861,13 @@ bail: for (i = 0; i < ARRAY_SIZE(hfi1_attributes); ++i) device_remove_file(&dev->dev, hfi1_attributes[i]); - for (i = 0; i < dd->num_sdma; i++) - kobject_del(&dd->per_sdma[i].kobj); + /* + * The function kobject_put() will call kobject_del() if the kobject + * has been added successfully. The sysfs files created under the + * kobject directory will also be removed during the process. + */ + for (; i >= 0; i--) + kobject_put(&dd->per_sdma[i].kobj); return ret; } @@ -875,6 +880,10 @@ void hfi1_verbs_unregister_sysfs(struct struct hfi1_pportdata *ppd; int i; + /* Unwind operations in hfi1_verbs_register_sysfs() */ + for (i = 0; i < dd->num_sdma; i++) + kobject_put(&dd->per_sdma[i].kobj); + for (i = 0; i < dd->num_pports; i++) { ppd = &dd->pport[i];