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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 4342BC433DF for ; Thu, 18 Jun 2020 02:37:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12DCA20720 for ; Thu, 18 Jun 2020 02:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592447836; bh=T6td+4xjECTmSXQaASCI8eGQ4IqtOOF1xI3Ve0AZX/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=i68LfRZ+xKe0NPJgwYonr3/yQq82zriGmhnchjpUk3RC6ZaM4EpkPH0hAlrdtJf7x n3bKlPBh7hIXQkXtJBA3KHKDCQmtLwxES0Bu1vjQKaxQvxgDVV7+U/WUjRS2L2ja/U M5/aglhsOVKf1f3IlwwZMtnb5XUW50Ey2KCfoO1M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387744AbgFRChN (ORCPT ); Wed, 17 Jun 2020 22:37:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:43134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729197AbgFRBNp (ORCPT ); Wed, 17 Jun 2020 21:13:45 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8AA0921924; Thu, 18 Jun 2020 01:13:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442825; bh=T6td+4xjECTmSXQaASCI8eGQ4IqtOOF1xI3Ve0AZX/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Et5Dno8JgiHTUwnIkwG5mfgdRwXRl3ptqoGtJmp3eHsWSijHD/vmRk7rRIgZsAR7z nWNeYqMa+tqBqPVfEDRkAthl2/3AR7jJ7TQar4WDseL/7OJzlQRaDqDYoyxXyoNjzu SZ6Jb/tqm3dP8xLOW9IONk48Yl2m96ike1jx3+4A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maor Gottlieb , Leon Romanovsky , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 261/388] IB/cma: Fix ports memory leak in cma_configfs Date: Wed, 17 Jun 2020 21:05:58 -0400 Message-Id: <20200618010805.600873-261-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maor Gottlieb [ Upstream commit 63a3345c2d42a9b29e1ce2d3a4043689b3995cea ] The allocated ports structure in never freed. The free function should be called by release_cma_ports_group, but the group is never released since we don't remove its default group. Remove default groups when device group is deleted. Fixes: 045959db65c6 ("IB/cma: Add configfs for rdma_cm") Link: https://lore.kernel.org/r/20200521072650.567908-1-leon@kernel.org Signed-off-by: Maor Gottlieb Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/cma_configfs.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/infiniband/core/cma_configfs.c b/drivers/infiniband/core/cma_configfs.c index c672a4978bfd..3c1e2ca564fe 100644 --- a/drivers/infiniband/core/cma_configfs.c +++ b/drivers/infiniband/core/cma_configfs.c @@ -322,8 +322,21 @@ static struct config_group *make_cma_dev(struct config_group *group, return ERR_PTR(err); } +static void drop_cma_dev(struct config_group *cgroup, struct config_item *item) +{ + struct config_group *group = + container_of(item, struct config_group, cg_item); + struct cma_dev_group *cma_dev_group = + container_of(group, struct cma_dev_group, device_group); + + configfs_remove_default_groups(&cma_dev_group->ports_group); + configfs_remove_default_groups(&cma_dev_group->device_group); + config_item_put(item); +} + static struct configfs_group_operations cma_subsys_group_ops = { .make_group = make_cma_dev, + .drop_item = drop_cma_dev, }; static const struct config_item_type cma_subsys_type = { -- 2.25.1