From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B32B1F75B1; Tue, 3 Dec 2024 15:09:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238580; cv=none; b=jI/dp98bubg0INQg3VVI01Hu3HwejGeloKC6f+q3DB5Z9/A2XomvCBnGfEHEPgdBWNZ1Lm7HBeuxbhI1BmOoFcY8Gx4TTqZ6EN/FxGEdDAu/VEiDoFmfYKuUs4DFGkaPTT7kwunNRp5ilHZVn1GcbBiLNqmWQXrwrLx8Rjr7Ub0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238580; c=relaxed/simple; bh=HmFsJ4VzdWeguAsEbL6C+3quO5D8WMKO7q3N3hhXQsE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Un27MfzhZitxOyD4vChZdqnV5NPxEAPslLyllmFBnSJI8p5+c4PDF2TgbCx1L2HpegFhwG2VkLAdMJQJgXBnQuOOgFNFzSEoctg/PulHl9elbSrCxtU6GAZ0ycAMVZXFeTDsRTKvL//3ZxaLrusMy95eNfldhmZAnYkyzMXnBDs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ps/eDx2x; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ps/eDx2x" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB0E4C4CECF; Tue, 3 Dec 2024 15:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733238580; bh=HmFsJ4VzdWeguAsEbL6C+3quO5D8WMKO7q3N3hhXQsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ps/eDx2xGLI4fO227AgzvATwecZAZ9eaSzVwXHovvSuFrx3ia3tK/Ehf+bEV1usjG sr+fU7s3W6fMa+hKKkhxWIebDyCaDlH1p0nLGXxua4sfIqI51GPdCmYmcGCivcfBwS vqIgmeafTDXFbRwFiekV6PaUUOKnHbiMfX4NA3fY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hao Ge , Eric Sandeen , Jan Kara , Sasha Levin Subject: [PATCH 6.11 326/817] isofs: avoid memory leak in iocharset Date: Tue, 3 Dec 2024 15:38:18 +0100 Message-ID: <20241203144008.543172610@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hao Ge [ Upstream commit 0b5bbeee4de616a268db77e2f40f19ab010a367b ] A memleak was found as below: unreferenced object 0xffff0000d10164d8 (size 8): comm "pool-udisksd", pid 108217, jiffies 4295408555 hex dump (first 8 bytes): 75 74 66 38 00 cc cc cc utf8.... backtrace (crc de430d31): [] kmemleak_alloc+0xb8/0xc8 [] __kmalloc_node_track_caller_noprof+0x380/0x474 [] kstrdup+0x70/0xfc [] isofs_parse_param+0x228/0x2c0 [isofs] [] vfs_parse_fs_param+0xf4/0x164 [] vfs_parse_fs_string+0x8c/0xd4 [] vfs_parse_monolithic_sep+0xb0/0xfc [] generic_parse_monolithic+0x30/0x3c [] parse_monolithic_mount_data+0x40/0x4c [] path_mount+0x6c4/0x9ec [] do_mount+0xac/0xc4 [] __arm64_sys_mount+0x16c/0x2b0 [] invoke_syscall+0x7c/0x104 [] el0_svc_common.constprop.1+0xe0/0x104 [] do_el0_svc+0x2c/0x38 [] el0_svc+0x3c/0x1b8 The opt->iocharset is freed inside the isofs_fill_super function, But there may be situations where it's not possible to enter this function. For example, in the get_tree_bdev_flags function,when encountering the situation where "Can't mount, would change RO state," In such a case, isofs_fill_super will not have the opportunity to be called,which means that opt->iocharset will not have the chance to be freed,ultimately leading to a memory leak. Let's move the memory freeing of opt->iocharset into isofs_free_fc function. Fixes: 1b17a46c9243 ("isofs: convert isofs to use the new mount API") Signed-off-by: Hao Ge Reviewed-by: Eric Sandeen Signed-off-by: Jan Kara Link: https://patch.msgid.link/20241106082841.51773-1-hao.ge@linux.dev Signed-off-by: Sasha Levin --- fs/isofs/inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index f50311a6b4299..47038e6608123 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -948,8 +948,6 @@ static int isofs_fill_super(struct super_block *s, struct fs_context *fc) goto out_no_inode; } - kfree(opt->iocharset); - return 0; /* @@ -987,7 +985,6 @@ static int isofs_fill_super(struct super_block *s, struct fs_context *fc) brelse(bh); brelse(pri_bh); out_freesbi: - kfree(opt->iocharset); kfree(sbi); s->s_fs_info = NULL; return error; @@ -1528,7 +1525,10 @@ static int isofs_get_tree(struct fs_context *fc) static void isofs_free_fc(struct fs_context *fc) { - kfree(fc->fs_private); + struct isofs_options *opt = fc->fs_private; + + kfree(opt->iocharset); + kfree(opt); } static const struct fs_context_operations isofs_context_ops = { -- 2.43.0