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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F008C001B2 for ; Tue, 20 Dec 2022 01:28:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233368AbiLTB1k (ORCPT ); Mon, 19 Dec 2022 20:27:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233274AbiLTBYk (ORCPT ); Mon, 19 Dec 2022 20:24:40 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3394120AD; Mon, 19 Dec 2022 17:22:43 -0800 (PST) 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 5E5916122C; Tue, 20 Dec 2022 01:22:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E934C4339B; Tue, 20 Dec 2022 01:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671499362; bh=YjKYcYfpOb6PqcTIHKEefSJ8xhGe0k0L/p/jPmC8q38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KBg7FORC2tidfI68azQfG+/37ElDqsjMa0TEHtrewv8Mt3zdpiXMlnD0wJxtMeUNr 9FpH43npAihu3rY2VbGpTMYRZQQ0Cpqh+WyT+B4C+BHAx7UWNogg1vPTT8GMMo9mVc lhV5+oR99gl806WFkwyzNOqDIfXXgfqL0NVztQNKhtJwryuqaRYLVQMRcXB8XM/8JP BpYxl2mzPuM4Ed2U1K5wjiVFCKp19IoUyakfUvg2qNoBZImp23fK001NhAnSLjjQ+f krFuVzuqNreXvfJ5JyyKcQae1t4okc3IoyAM4T4tdZAXOcxZMPrcTfZo0DDKVxuyl6 WTjKdtmy8kjnw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Xiaoxu , Mike Marshall , Sasha Levin , devel@lists.orangefs.org Subject: [PATCH AUTOSEL 4.19 3/3] orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string() Date: Mon, 19 Dec 2022 20:22:36 -0500 Message-Id: <20221220012237.1222810-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221220012237.1222810-1-sashal@kernel.org> References: <20221220012237.1222810-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Xiaoxu [ Upstream commit d23417a5bf3a3afc55de5442eb46e1e60458b0a1 ] When insert and remove the orangefs module, then debug_help_string will be leaked: unreferenced object 0xffff8881652ba000 (size 4096): comm "insmod", pid 1701, jiffies 4294893639 (age 13218.530s) hex dump (first 32 bytes): 43 6c 69 65 6e 74 20 44 65 62 75 67 20 4b 65 79 Client Debug Key 77 6f 72 64 73 20 61 72 65 20 75 6e 6b 6e 6f 77 words are unknow backtrace: [<0000000004e6f8e3>] kmalloc_trace+0x27/0xa0 [<0000000006f75d85>] orangefs_prepare_debugfs_help_string+0x5e/0x480 [orangefs] [<0000000091270a2a>] _sub_I_65535_1+0x57/0xf70 [crc_itu_t] [<000000004b1ee1a3>] do_one_initcall+0x87/0x2a0 [<000000001d0614ae>] do_init_module+0xdf/0x320 [<00000000efef068c>] load_module+0x2f98/0x3330 [<000000006533b44d>] __do_sys_finit_module+0x113/0x1b0 [<00000000a0da6f99>] do_syscall_64+0x35/0x80 [<000000007790b19b>] entry_SYSCALL_64_after_hwframe+0x46/0xb0 When remove the module, should always free debug_help_string. Should always free the allocated buffer when change the free_debug_help_string. Signed-off-by: Zhang Xiaoxu Signed-off-by: Mike Marshall Signed-off-by: Sasha Levin --- fs/orangefs/orangefs-debugfs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c index e24738c691f6..f79c015fa7cb 100644 --- a/fs/orangefs/orangefs-debugfs.c +++ b/fs/orangefs/orangefs-debugfs.c @@ -254,6 +254,8 @@ static int orangefs_kernel_debug_init(void) void orangefs_debugfs_cleanup(void) { debugfs_remove_recursive(debug_dir); + kfree(debug_help_string); + debug_help_string = NULL; } /* open ORANGEFS_KMOD_DEBUG_HELP_FILE */ @@ -709,6 +711,7 @@ int orangefs_prepare_debugfs_help_string(int at_boot) memset(debug_help_string, 0, DEBUG_HELP_STRING_SIZE); strlcat(debug_help_string, new, string_size); mutex_unlock(&orangefs_help_file_lock); + kfree(new); } rc = 0; -- 2.35.1