From patchwork Fri Dec 31 04:12:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12701808 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 81168C433FE for ; Fri, 31 Dec 2021 04:12:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12B1D6B008C; Thu, 30 Dec 2021 23:12:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 089516B0093; Thu, 30 Dec 2021 23:12:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E91CC6B0096; Thu, 30 Dec 2021 23:12:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0175.hostedemail.com [216.40.44.175]) by kanga.kvack.org (Postfix) with ESMTP id D96F06B008C for ; Thu, 30 Dec 2021 23:12:37 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 8B696181AC9C6 for ; Fri, 31 Dec 2021 04:12:37 +0000 (UTC) X-FDA: 78976767954.09.D69D2C7 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf30.hostedemail.com (Postfix) with ESMTP id 20AAA80005 for ; Fri, 31 Dec 2021 04:12:37 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 25EE8615BA; Fri, 31 Dec 2021 04:12:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5ACFEC36AE9; Fri, 31 Dec 2021 04:12:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1640923955; bh=qAa71we+OzH5frizipYFiM2+rzEExaMHymKmGW3O0VY=; h=Date:From:To:Subject:In-Reply-To:From; b=YD+OR0pTQXCDeCTH0vi2rQScST1fUXVhUHIAxKRL+SiVcc5hI3KWx2aAJ7Efmhnmf wfFw3503EbJDxDS1icFXf41aZpU8CehX7LvyIXzBQpYYG8XXFc4Gwe0U3lwDzqZfB0 8x5Hp1vNfYl9I1t5UGD0iFX9QhkSjmEUKZDJ5IyA= Date: Thu, 30 Dec 2021 20:12:34 -0800 From: Andrew Morton To: akpm@linux-foundation.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, sj@kernel.org, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 2/2] mm/damon/dbgfs: fix 'struct pid' leaks in 'dbgfs_target_ids_write()' Message-ID: <20211231041234.50dCet98O%akpm@linux-foundation.org> In-Reply-To: <20211230201202.d9bcb24678cc3d9d503579a0@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: 20AAA80005 X-Stat-Signature: 8zco4d3tndmz14k6e1jjxzpzmik35f4p Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=YD+OR0pT; spf=pass (imf30.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Rspamd-Server: rspam10 X-HE-Tag: 1640923957-312507 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: SeongJae Park Subject: mm/damon/dbgfs: fix 'struct pid' leaks in 'dbgfs_target_ids_write()' DAMON debugfs interface increases the reference counts of 'struct pid's for targets from the 'target_ids' file write callback ('dbgfs_target_ids_write()'), but decreases the counts only in DAMON monitoring termination callback ('dbgfs_before_terminate()'). Therefore, when 'target_ids' file is repeatedly written without DAMON monitoring start/termination, the reference count is not decreased and therefore memory for the 'struct pid' cannot be freed. This commit fixes this issue by decreasing the reference counts when 'target_ids' is written. Link: https://lkml.kernel.org/r/20211229124029.23348-1-sj@kernel.org Fixes: 4bc05954d007 ("mm/damon: implement a debugfs-based user space interface") Signed-off-by: SeongJae Park Cc: [5.15+] Signed-off-by: Andrew Morton --- mm/damon/dbgfs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/mm/damon/dbgfs.c~mm-damon-dbgfs-fix-struct-pid-leaks-in-dbgfs_target_ids_write +++ a/mm/damon/dbgfs.c @@ -353,6 +353,7 @@ static ssize_t dbgfs_target_ids_write(st const char __user *buf, size_t count, loff_t *ppos) { struct damon_ctx *ctx = file->private_data; + struct damon_target *t, *next_t; bool id_is_pid = true; char *kbuf, *nrs; unsigned long *targets; @@ -397,8 +398,12 @@ static ssize_t dbgfs_target_ids_write(st goto unlock_out; } - /* remove targets with previously-set primitive */ - damon_set_targets(ctx, NULL, 0); + /* remove previously set targets */ + damon_for_each_target_safe(t, next_t, ctx) { + if (targetid_is_pid(ctx)) + put_pid((struct pid *)t->id); + damon_destroy_target(t); + } /* Configure the context for the address space type */ if (id_is_pid)