Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1514546ybb; Sat, 11 Apr 2020 05:23:26 -0700 (PDT) X-Google-Smtp-Source: APiQypJrcPF/sajmscOhEfT5xj02/S0j0Rh2JD1diVkBPlhHGyfqsIj+ApMH06fcd1UfB38zLQMU X-Received: by 2002:a37:6407:: with SMTP id y7mr8248557qkb.462.1586607806338; Sat, 11 Apr 2020 05:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586607806; cv=none; d=google.com; s=arc-20160816; b=A/sY9iPFsD+pIOJdGEY3PEcfuW7vMz+5cMbNtcYiOQq7rG3enU0CFrr1cBEK8u7cbw VH8jn5V/csGvRmXL6m+6FxPJsiIl/OQIJ2m2Sf/T5ox4mGxtIEdEId9sitsfw/7Ge1kD PVIpl5HsaFDaM4SxcxIl4x6H0aSqz3bBYHwqzlDae8iZItfQ/rlm5+IEVDeZpmh03qDM mIKs5BRwLPZzuGIxx5j/PB6TbgUw9F6YeDlMmz0FMt4GU0PZ0jCAPKl2wJwMp8Miu7mx tyXx3MzZnK8eHVuCmgHXStcReG8qePnhrdvUI7slBtsBYXuw4xTLvzD1Rx01FvZhamtu ZHBg== 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=byMaeXcAn2dNn8hNQQlqfhuyswNFTgDMi9JyQKGKBls=; b=CK9E1Lr5G+he9DNHjo9CPsqA1ZPvzsBwQvWqvqQmRdfTs3GRFncrVd4V+y4qmjPRUl DNGtCh4l0kQWZecpEi0p50jBcDfSl4ET7w8twh37iXV7Gw1QRLKgDAGtoGn0dC81PHVG XmH4DiK/3ksavgEUK1d1WXkBix9WwgAhz9n76/ZNKP4vhAw4WDHmheSETO9BO1Q7MAor dobTxrD4zbjIUxFfEEZ8uKB+NN8pZE6JIK4RmjI9BjmKG8ejfpxYn6myPH86PnIAP9YX VxP1vUp8m8w8hfEJ5bLOIsnAE512xuiQMh1DUd51piNupFO/e6Qqfa8q19GTtYvnzSGW C9Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MBcj8zV4; 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 t8si2536604qtq.25.2020.04.11.05.23.12; Sat, 11 Apr 2020 05:23:26 -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=MBcj8zV4; 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 S1729139AbgDKMVM (ORCPT + 99 others); Sat, 11 Apr 2020 08:21:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:57306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729128AbgDKMVI (ORCPT ); Sat, 11 Apr 2020 08:21:08 -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 0688920644; Sat, 11 Apr 2020 12:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586607668; bh=x+E2xz4xkcBrixnVfWase73ISMftFL+eb6NjsKnyOLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MBcj8zV4lnVKPlnC9lt7I2wSyYyfo5YKEtA1Jcf/MMI8yvO9wG4+2P+2ul6CSG9sY Ji1RDRZMWDaTu84VZcjsqBIljjyG0M9qcnIUNN1zN52jKiWGS5g2fTfarh4WNXBMeR GQO7tiB64gikjW/US9LpuSL0p5ajC5OD72IMn8fg= 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 5.6 27/38] IB/hfi1: Fix memory leaks in sysfs registration and unregistration Date: Sat, 11 Apr 2020 14:10:04 +0200 Message-Id: <20200411115502.719828124@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200411115459.324496182@linuxfoundation.org> References: <20200411115459.324496182@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 @@ -856,8 +856,13 @@ int hfi1_verbs_register_sysfs(struct hfi return 0; bail: - 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; } @@ -870,6 +875,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];