Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3123421rwb; Mon, 15 Aug 2022 18:42:24 -0700 (PDT) X-Google-Smtp-Source: AA6agR7k/mUBOFV8h1JiEbx5U0C7RK1LJ58WDJn19ilEW1RIzjSZelxS2syh/43ITIKVuBhb2g54 X-Received: by 2002:a17:902:db0c:b0:16f:25c0:a546 with SMTP id m12-20020a170902db0c00b0016f25c0a546mr18915593plx.14.1660614143785; Mon, 15 Aug 2022 18:42:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660614143; cv=none; d=google.com; s=arc-20160816; b=SUQYlFLtC314U4T/TNprAVVlTEjJm0yyat3Js7QK/LC69h6IFZPzxxqZEDxSOkxlWT 1+vGbdIaNmCBpAX7ri37GGKmBQ/1isOVCcJIASduy48N0cCCyPdcDf1He3Gc/WBcFQfJ ta3DOVD+7uV5K0Wke2vwzzX5HGbRKBhEIaOhwkux1VFO9TJne6y83XWGnYoS8B6ulM+x QAUR7TG2n5lP6nCxosHVMj2TzyViKxvtzdFaIyiYEovGMLQITLpkJDRcEwnDmVlCAcYr QI3PizlqXkXatQpB3d0LmilL5oysj32W/+TLamUCuTWTeAtjTcCyk+I9gVjPX1OhhaqI iCHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2e7zPXxClxSgb5JGa2JA7gEVrg9uQ0X2APguH2JmYhs=; b=RRdzdYMqnfqxE6Nr95H1O3OF9QyqSVfFKB4zc7aYNXBkZ1MECvNGg6rgRKm4M4aTZ0 x5iCgvxKZWI/ztTP2+TRj7NYn7IhTqhy0feltk43zTelb9+QD0KVmcKv18Wwv/ZpoEtB 9PmXwbuCBK7dS9VQuT54F4KYtvyHDJm6GPZwsZNNthiL1S+NFiwwx+p9s+9S5WtX+adD ZEpc+9zlqsZ2KR6HtCYrNGahQXIVIsmxxziEAlTRA+fNLrz3fmlvi/uVIyueeFngdFyD m7kIq1fh457gwPI/21cK5itw+0CaUmP8toX1BIdACAw36rzX7DwcV6B1KjZ/hhmpXBZQ pHzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BuiOuTb3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 137-20020a62198f000000b005251a325ea0si7463568pfz.269.2022.08.15.18.42.11; Mon, 15 Aug 2022 18:42:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BuiOuTb3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344201AbiHPBED (ORCPT + 99 others); Mon, 15 Aug 2022 21:04:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348688AbiHPA5r (ORCPT ); Mon, 15 Aug 2022 20:57:47 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38B0ADB05B; Mon, 15 Aug 2022 13:49:08 -0700 (PDT) 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 A1FD6B811A6; Mon, 15 Aug 2022 20:49:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD7E8C433C1; Mon, 15 Aug 2022 20:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660596544; bh=w43Nn+CdXHZ0uAurAwKFhgQo8GpfGScQCXNh5qjlBX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BuiOuTb3ZXWi88VF/YKT0XARd7yWJa7ec3KJ3PtWknjZeNqvIk/4YSlFzl/905qE2 PlIfML5cAdi5HaUWrUcnCfkKXI0jT0TteXdU68Il47xds78x+2kyLDbUrFcJMMkPzK sPB9pkHF7GMuMUEapdU2WwaeZ5IIEDMjdWv3Th5A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jianglei Nie , SeongJae Park , Andrew Morton , Sasha Levin Subject: [PATCH 5.19 1112/1157] mm/damon/reclaim: fix potential memory leak in damon_reclaim_init() Date: Mon, 15 Aug 2022 20:07:48 +0200 Message-Id: <20220815180524.793320919@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jianglei Nie [ Upstream commit 188043c7f4f2bd662f2a55957d684fffa543e600 ] damon_reclaim_init() allocates a memory chunk for ctx with damon_new_ctx(). When damon_select_ops() fails, ctx is not released, which will lead to a memory leak. We should release the ctx with damon_destroy_ctx() when damon_select_ops() fails to fix the memory leak. Link: https://lkml.kernel.org/r/20220714063746.2343549-1-niejianglei2021@163.com Fixes: 4d69c3457821 ("mm/damon/reclaim: use damon_select_ops() instead of damon_{v,p}a_set_operations()") Signed-off-by: Jianglei Nie Reviewed-by: SeongJae Park Cc: Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- mm/damon/reclaim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c index 4b07c29effe9..0b3c7396cb90 100644 --- a/mm/damon/reclaim.c +++ b/mm/damon/reclaim.c @@ -441,8 +441,10 @@ static int __init damon_reclaim_init(void) if (!ctx) return -ENOMEM; - if (damon_select_ops(ctx, DAMON_OPS_PADDR)) + if (damon_select_ops(ctx, DAMON_OPS_PADDR)) { + damon_destroy_ctx(ctx); return -EINVAL; + } ctx->callback.after_wmarks_check = damon_reclaim_after_wmarks_check; ctx->callback.after_aggregation = damon_reclaim_after_aggregation; -- 2.35.1