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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6971BC6FA82 for ; Mon, 26 Sep 2022 16:30:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B53AA8E0071; Mon, 26 Sep 2022 12:30:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ADB098E0066; Mon, 26 Sep 2022 12:30:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97B358E0071; Mon, 26 Sep 2022 12:30:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 82F278E0066 for ; Mon, 26 Sep 2022 12:30:04 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4BCBC407E1 for ; Mon, 26 Sep 2022 16:30:04 +0000 (UTC) X-FDA: 79954773528.24.8CA4588 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf18.hostedemail.com (Postfix) with ESMTP id 8750E1C0009 for ; Mon, 26 Sep 2022 16:30:03 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 57239B80AD5; Mon, 26 Sep 2022 16:30:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E134C433D7; Mon, 26 Sep 2022 16:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664209799; bh=A0ybDQ51k9oJ4ReXs2ASvQDuahhVl27PCcQijNdbvAM=; h=From:To:Cc:Subject:Date:From; b=hjN/hB0zGhz3na2PG5iAkJqXXc5bQQNxUkkawQYUsXZjhFSP4t/FIrcSP9LMHgz4V l5wlnfDuyqH2UsyztWNPqxQbBOrgFkbdoikNzpjwWyn/pfKRM+jcKvKXkJ4AE/Ejhs ozNgEVsNmalsJJ90/1GVRB1e+LZIbwi6mGJrmPGW7aN3gNSVOGsx6zD6LkQIwMz1jI 68gSrZG9ecu46Kw+JnAu/9ePvJ0bVRKrNpC06UCcE0LkMAPHmCr0zof9lUtyNS1ctP sw8SWj81H96sMcksfDcRI6ffD4jm60N0BZjyyGNsU7Jq0Nw/dMJYWp8ACtcZ7Lt3TG +xMK5o0cmsMGw== From: SeongJae Park To: akpm@linux-foundation.org Cc: ppbuk5246@gmail.com, damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, SeongJae Park Subject: [PATCH v5] damon/sysfs: fix possible memleak on damon_sysfs_add_target Date: Mon, 26 Sep 2022 16:29:51 +0000 Message-Id: <20220926162951.49496-1-sj@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664209803; a=rsa-sha256; cv=none; b=KCwNypRsDYMSUP3z2xX3ihyBSbjmkArQGAJKqGEKJfWixkdw13AMdUn6yhtase6IAYWORO 1OjArVZKItjNQNKadnwu2oQshQPPRupGR5Du37Br/eLH5l6AnaiXlkeHGiLVBSgpVULjTE SyUgG6rZlP3ZAjz/dKQj/oRGGmfdKH0= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="hjN/hB0z"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664209803; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=SQnval/7mf1ly3Eo7NmR/ZUg7wOTD4YKn7dwaVQsgkY=; b=58UsDd7TPwwAymWDOuvL5RPfM9lmf0tq0kxj7mR5LiJ7Gzekm96Rktol/avk7Yc2IxohCk HyvphveEspXiEzS1Ycr/ike5MkTJd7OrxCiuUOomau87OEv7K9loUlHlB5CV4MoaeiBQ6V twq+NoYEBKy+B1YOJ//+2InOe5YQ6/w= X-Stat-Signature: j5oe8fmspza5h4th4cde7jw57i4k886w X-Rspam-User: X-Rspamd-Server: rspam04 Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="hjN/hB0z"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sj@kernel.org X-Rspamd-Queue-Id: 8750E1C0009 X-HE-Tag: 1664209803-869193 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Levi Yun When damon_sysfs_add_target couldn't find proper task, newly allocated damon_target structure isn't registered yet. So, it's impossible to free the newly allocated one by damon_sysfs_destroy_targets. By calling damon_add_target as soon as allocating new target, fix this possible memory leak. Fixes: a61ea561c871 ("mm/damon/sysfs: link DAMON for virtual address spaces monitoring") Cc: # 5.17.x Signed-off-by: Levi Yun Reviewed-by: SeongJae Park Signed-off-by: SeongJae Park --- Changes from v4 (https://lore.kernel.org/damon/20220926160611.48536-1-sj@kernel.org/_ - Fix some typos Changes from v3 (https://lore.kernel.org/damon/20220925234327.26345-1-ppbuk5246@gmail.com/) - Fix Fixes: tag - Add patch changelog Changes from v2 (https://lore.kernel.org/damon/20220925234053.26090-1-ppbuk5246@gmail.com/) - Add Fixes: and Cc: stable Changes from v1 (https://lore.kernel.org/damon/20220925140257.23431-1-ppbuk5246@gmail.com/) - Do damon_add_target() earlier instead of explicitly freeing the object mm/damon/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c index 455215a5c059..9f1219a67e3f 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -2172,12 +2172,12 @@ static int damon_sysfs_add_target(struct damon_sysfs_target *sys_target, if (!t) return -ENOMEM; + damon_add_target(ctx, t); if (damon_target_has_pid(ctx)) { t->pid = find_get_pid(sys_target->pid); if (!t->pid) goto destroy_targets_out; } - damon_add_target(ctx, t); err = damon_sysfs_set_regions(t, sys_target->regions); if (err) goto destroy_targets_out; -- 2.25.1