From: "Mårten Lindahl" <marten.lindahl@axis.com> To: Richard Weinberger <richard@nod.at> Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, "Zhihao Cheng" <chengzhihao1@huawei.com>, kernel@axis.com, "Mårten Lindahl" <marten.lindahl@axis.com> Subject: [PATCH] ubifs: Fix memory leak in do_rename Date: Thu, 30 Mar 2023 16:07:53 +0200 [thread overview] Message-ID: <20230330-memleak_rename-fix-v1-1-99789e908fdf@axis.com> (raw) 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 <chengzhihao1@huawei.com> Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> --- 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 = S_IFCHR | WHITEOUT_MODE; struct inode *inode; struct ubifs_info *c = dir->i_sb->s_fs_info; - struct fscrypt_name nm; /* * Create an inode('nlink = 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); - err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); - if (err) - return ERR_PTR(err); - inode = ubifs_new_inode(c, dir, mode, false); if (IS_ERR(inode)) { err = 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, -- Mårten Lindahl <marten.lindahl@axis.com>
WARNING: multiple messages have this Message-ID (diff)
From: "Mårten Lindahl" <marten.lindahl@axis.com> To: Richard Weinberger <richard@nod.at> Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, "Zhihao Cheng" <chengzhihao1@huawei.com>, kernel@axis.com, "Mårten Lindahl" <marten.lindahl@axis.com> Subject: [PATCH] ubifs: Fix memory leak in do_rename Date: Thu, 30 Mar 2023 16:07:53 +0200 [thread overview] Message-ID: <20230330-memleak_rename-fix-v1-1-99789e908fdf@axis.com> (raw) 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 <chengzhihao1@huawei.com> Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> --- 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 = S_IFCHR | WHITEOUT_MODE; struct inode *inode; struct ubifs_info *c = dir->i_sb->s_fs_info; - struct fscrypt_name nm; /* * Create an inode('nlink = 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); - err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); - if (err) - return ERR_PTR(err); - inode = ubifs_new_inode(c, dir, mode, false); if (IS_ERR(inode)) { err = 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, -- Mårten Lindahl <marten.lindahl@axis.com> ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next reply other threads:[~2023-03-30 14:08 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-30 14:07 Mårten Lindahl [this message] 2023-03-30 14:07 ` [PATCH] ubifs: Fix memory leak in do_rename Mårten Lindahl 2023-03-30 14:17 ` Zhihao Cheng 2023-03-30 14:17 ` Zhihao Cheng 2023-03-30 14:38 ` Mårten Lindahl 2023-03-30 14:38 ` Mårten Lindahl
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230330-memleak_rename-fix-v1-1-99789e908fdf@axis.com \ --to=marten.lindahl@axis.com \ --cc=chengzhihao1@huawei.com \ --cc=kernel@axis.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=richard@nod.at \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.