From nobody Mon Feb 9 17:59:12 2026 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 78815C6FD1D for ; Thu, 30 Mar 2023 14:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbjC3OIh (ORCPT ); Thu, 30 Mar 2023 10:08:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232056AbjC3OIa (ORCPT ); Thu, 30 Mar 2023 10:08:30 -0400 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CBFEC150 for ; Thu, 30 Mar 2023 07:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1680185285; x=1711721285; h=from:date:subject:mime-version:content-transfer-encoding: message-id:to:cc; bh=SDhALq5sqn8JFnI5dxt8aiWfo1+gUXMcuGRIDtBs4P4=; b=LqhMZhYWJQSJww1iTO2O4mrlqvglmq877kWtnQlBaKc+jVWAtF2BomI4 xgY/2nLyJxCto/cI+3p8gy/AqNDK0iBAYrvW1+IdjvrFJ1fNAWU6myqmc SjGANIxei/YjeMFqZtmND5nWjoCiWaDxeYAu8rNSR5IOkEL12Ep4Wp3fz P3g74IlcLor19/ZjrTCNboz4poPcXPuM2sewltmhEj5RX5SNj2y6YkvEe /LL3CbgvqXIv2jzESAai0K6ARYTUcHR2YrEWL+B6AfUfYXdZG/xZZz8IM Zin0BzSNyq5ImsKuyu4df3pdXwtQeQtX+jYPjU0FoFp0uQVMiSu4tb8UW g==; From: =?utf-8?q?M=C3=A5rten_Lindahl?= Date: Thu, 30 Mar 2023 16:07:53 +0200 Subject: [PATCH] ubifs: Fix memory leak in do_rename MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20230330-memleak_rename-fix-v1-1-99789e908fdf@axis.com> X-B4-Tracking: v=1; b=H4sIALiXJWQC/x2NUQrCQAxEr1LybWDtqlCvIiJpndqgu0oiIpTe3 dSfgcfMY2ZymMLp2Mxk+KjrswZsNw0Nk9QbWK/B1KY2p5wTF5QH5H4xVCngUb98GLudRHR5nyj EXhzcm9RhWtUi/oatxcsQ+//b6bwsP3vMayV9AAAA To: Richard Weinberger CC: , , "Zhihao Cheng" , , =?utf-8?q?M=C3=A5rten_Lindahl?= X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1680185276; l=2241; i=marten.lindahl@axis.com; s=20230329; h=from:subject:message-id; bh=g5Ezw3BIW1qMna/ZzA/RPpn1WuFGRca/jEji/cb2cqI=; b=WCzt4Sw1mS2Gl47E7zLF5LpSr1wrbn6+7tEXL/6u2aDOZpV64OMUohefncYOsLMU2sE9WZQdX q0ymzNszV3pDh0wqp8Rabz5jssxJ1xfhGx5HpigjfACDePmvIlSYeJV X-Developer-Key: i=marten.lindahl@axis.com; a=ed25519; pk=JfbjqFPJnIDIQOkJBeatC8+S3Ax3N0RIdmN+fL3wXgw= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If renaming a file in an encrypted directory, function fscrypt_setup_filename allocates memory for a file name. This name is never used, and before returning to the caller the memory for it is not freed. When running kmemleak on it we see that it is registered as a leak. The report below is triggered by a simple program 'rename' that renames a file in an encrypted directory: unreferenced object 0xffff888101502840 (size 32): comm "rename", pid 9404, jiffies 4302582475 (age 435.735s) backtrace: __kmem_cache_alloc_node __kmalloc fscrypt_setup_filename do_rename ubifs_rename vfs_rename do_renameat2 To fix this we can remove the call to fscrypt_setup_filename as it's not needed. Reported-by: Zhihao Cheng Signed-off-by: M=C3=A5rten Lindahl Reviewed-by: Zhihao Cheng --- fs/ubifs/dir.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 0f29cf201136..4c2dda1346e7 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -358,7 +358,6 @@ static struct inode *create_whiteout(struct inode *dir,= struct dentry *dentry) umode_t mode =3D S_IFCHR | WHITEOUT_MODE; struct inode *inode; struct ubifs_info *c =3D dir->i_sb->s_fs_info; - struct fscrypt_name nm; =20 /* * Create an inode('nlink =3D 1') for whiteout without updating journal, @@ -369,10 +368,6 @@ static struct inode *create_whiteout(struct inode *dir= , struct dentry *dentry) dbg_gen("dent '%pd', mode %#hx in dir ino %lu", dentry, mode, dir->i_ino); =20 - err =3D fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); - if (err) - return ERR_PTR(err); - inode =3D ubifs_new_inode(c, dir, mode, false); if (IS_ERR(inode)) { err =3D PTR_ERR(inode); @@ -395,7 +390,6 @@ static struct inode *create_whiteout(struct inode *dir,= struct dentry *dentry) make_bad_inode(inode); iput(inode); out_free: - fscrypt_free_filename(&nm); ubifs_err(c, "cannot create whiteout file, error %d", err); return ERR_PTR(err); } --- base-commit: c9c3395d5e3dcc6daee66c6908354d47bf98cb0c change-id: 20230330-memleak_rename-fix-6f94a6f99350 Best regards, --=20 M=C3=A5rten Lindahl