From patchwork Sun Oct 2 22:54:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yun Levi X-Patchwork-Id: 12997005 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 BBC9FC433F5 for ; Sun, 2 Oct 2022 22:55:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F343D8E0002; Sun, 2 Oct 2022 18:55:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE3B88E0001; Sun, 2 Oct 2022 18:55:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D84418E0002; Sun, 2 Oct 2022 18:55:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C42FF8E0001 for ; Sun, 2 Oct 2022 18:55:25 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8AFC214071B for ; Sun, 2 Oct 2022 22:55:25 +0000 (UTC) X-FDA: 79977517410.21.B82580D Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf21.hostedemail.com (Postfix) with ESMTP id 29B191C0005 for ; Sun, 2 Oct 2022 22:55:24 +0000 (UTC) Received: by mail-pj1-f50.google.com with SMTP id gf8so5930127pjb.5 for ; Sun, 02 Oct 2022 15:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=b/cqXABwEkVImEJzZr0tX/Uc5PPjefuHaywOkawSlcY=; b=e3IO949lN/8sVUNjQ+f64Hso5GFXmlyB0SjpN3tte03IMJnjrXpYn6C/otRd6N+yoz kLupU+EtDt2MyMhd2hzAWVDyKRF0UfKV0FkvffC7P+c9sfirldy6/TUKJTIKVO1Qm5dP 5XivOUXdhYxW1Cd85uhVKCkDnFxNlSIu1kT7qsNdgyAwWtFuExbXtf1kde0pRj5GgEQu REgTVX8nZSKd4FODAwVV99LnmdHD9eUgSf91YkWrih5Nr9qj6ZEDKWEcxXS+rRKRkGYL StSnspO1mf+BZjp5hEpFCYPLfWVSuHk3f+yLbcHc9hJp3yH9lOER6aDp1Y/i5BAQ2CyO 1tow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=b/cqXABwEkVImEJzZr0tX/Uc5PPjefuHaywOkawSlcY=; b=PDqboZwE86N5skmCT7EIuKc4ApM+rKh1P2M5pRm/YN1qyVSe5ztbUv3BP8jUMd86lG hJQIXxgEiRZa6VhMamALr+Q+gNSuhE1tkYOSejojjgOhAJ3L7sG43rfFG3N3yoqbY0zb YZzCzWEY3BnkBz90jxY4MLp5gTHrf8Typkm3/03cLLC09lVN/KAhv4dHU9sWyp4kcrjm m7qA4CvwQI3sYPLKRwGsZB5GgtppICgDNOVQtOUu9vlO7TRitfxWvOOhwjYS8H2x2bw9 Iqk6hmtuWTVK7i/rGEyQYSI4u2r+pTA0Ays4QffO1OB1NfWU3BEOy+KjFhIvw8HGn91i 481Q== X-Gm-Message-State: ACrzQf3xhGpuxNP+pL4/SFIzpHFDHnHytC9wKDlXB88uXALGWjtHzIXB eUcF0yCkka70pQ3VMzKeQtY= X-Google-Smtp-Source: AMsMyM4hRvMaReSshv6hmGDBn+Lt+0ll8ylRSELdGJqX1tqjcjkgEoHMUa4emdmB/MBQav7x0XZzpA== X-Received: by 2002:a17:90b:4c03:b0:20a:919d:44a3 with SMTP id na3-20020a17090b4c0300b0020a919d44a3mr4070665pjb.146.1664751323871; Sun, 02 Oct 2022 15:55:23 -0700 (PDT) Received: from localhost.localdomain ([211.226.85.205]) by smtp.gmail.com with ESMTPSA id y2-20020a17090a86c200b001f5513f6fb9sm5297022pjv.14.2022.10.02.15.55.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 02 Oct 2022 15:55:23 -0700 (PDT) From: Levi Yun To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, sj@kernel.org, akpm@linux-foundation.org, damon@lists.linux.dev, linux-mm@kvack.org, Levi Yun Subject: [PATCH for-stable-5.19.y] fix possible memleak on damon_sysfs_add_target Date: Mon, 3 Oct 2022 07:54:45 +0900 Message-Id: <20221002225444.70464-1-ppbuk5246@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664751325; 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=b/cqXABwEkVImEJzZr0tX/Uc5PPjefuHaywOkawSlcY=; b=zNrLd0zweVOGdPHpQVcdFOSEGJnbVL3WATX0HXaeI4SqmLauFyh0zxsDMPHWWlSYF4AQiE OjiP81m42TOVVHbc56rzIGW8UtDFcWZWJO2E244VjBMnDaNCShqySuMF9Jf/bQZopUUKdQ mzaDSOKdYSSgTQPvUHvCK9rtv1DIo54= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=e3IO949l; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of ppbuk5246@gmail.com designates 209.85.216.50 as permitted sender) smtp.mailfrom=ppbuk5246@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664751325; a=rsa-sha256; cv=none; b=D+yXb2d7SPjyerGl81Q+yB70khFqovD7Q+aKuhxPm8AFiJjzyta/LiHGZe9SMudZ10qEpQ ppkglquBqFduvwKRPVUanmOhK4tsW3Acy/KAO+Y55mNCNwyggSZ4kkoCGXBJKmBN7BUq+/ v2hs70BSJJdZyb3v+AoThvKZoTviJR8= X-Rspam-User: X-Stat-Signature: kb8keony6eykqocj3y81ht7cgka7xqtk X-Rspamd-Queue-Id: 29B191C0005 Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=e3IO949l; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of ppbuk5246@gmail.com designates 209.85.216.50 as permitted sender) smtp.mailfrom=ppbuk5246@gmail.com X-Rspamd-Server: rspam01 X-HE-Tag: 1664751324-172128 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: commit 1c8e2349f2d0 ("damon/sysfs: fix possible memleak on damon_sysfs_add_target") upstream. When damon_sysfs_add_target couldn't find proper task, New allocated damon_target structure isn't registered yet, So, it's impossible to free new allocated one by damon_sysfs_destroy_targets. By calling damon_add_target as soon as allocating new target, Fix this possible memory leak. Link: https://lkml.kernel.org/r/20220926160611.48536-1-sj@kernel.org Fixes: a61ea561c871 ("mm/damon/sysfs: link DAMON for virtual address spaces monitoring") Signed-off-by: Levi Yun Signed-off-by: SeongJae Park Reviewed-by: SeongJae Park Cc: # 5.19.x Signed-off-by: Andrew Morton --- mm/damon/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.35.1 diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c index 09f9e8ca3d1f..5b5ee3308d71 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -2181,13 +2181,13 @@ static int damon_sysfs_add_target(struct damon_sysfs_target *sys_target, if (!t) return -ENOMEM; + damon_add_target(ctx, t); if (ctx->ops.id == DAMON_OPS_VADDR || ctx->ops.id == DAMON_OPS_FVADDR) { 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;