[PATCH] fs/ntfs3: call _ntfs_bad_inode() when failing to rename

[PATCH] fs/ntfs3: call _ntfs_bad_inode() when failing to rename

[Helen Koike]

It is safe to call _ntfs_bad_inode on live inodes since:
  commit 519b078998ce ("fs/ntfs3: Exclude call make_bad_inode for live nodes.")

The WARN_ON was added when it wasn't safe by:
  commit d99208b91933 ("fs/ntfs3: cancle set bad inode after removing name fails")

Replace the WARN_ON with a call to _ntfs_bad_inode() to prevent further
operations on the inconsistent inode.

Reported-by: syzbot+4d8e30dbafb5c1260479@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=4d8e30dbafb5c1260479
Fixes: 519b078998ce ("fs/ntfs3: Exclude call make_bad_inode for live nodes.")
Signed-off-by: Helen Koike <koike@igalia.com>
---
 fs/ntfs3/frecord.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index 7b035da63c12..78eb065c7e43 100644
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -2800,8 +2800,8 @@ int ni_rename(struct ntfs_inode *dir_ni, struct ntfs_inode *new_dir_ni,
 	err = ni_add_name(new_dir_ni, ni, new_de);
 	if (!err) {
 		err = ni_remove_name(dir_ni, ni, de, &de2, &undo);
-		WARN_ON(err &&
-			ni_remove_name(new_dir_ni, ni, new_de, &de2, &undo));
+		if (err && ni_remove_name(new_dir_ni, ni, new_de, &de2, &undo))
+			_ntfs_bad_inode(&ni->vfs_inode);
 	}
 
 	/*
-- 
2.53.0

Re: [PATCH] fs/ntfs3: call _ntfs_bad_inode() when failing to rename

[Konstantin Komarov]

On 5/6/26 19:08, Helen Koike wrote:

> It is safe to call _ntfs_bad_inode on live inodes since:
>    commit 519b078998ce ("fs/ntfs3: Exclude call make_bad_inode for live nodes.")
>
> The WARN_ON was added when it wasn't safe by:
>    commit d99208b91933 ("fs/ntfs3: cancle set bad inode after removing name fails")
>
> Replace the WARN_ON with a call to _ntfs_bad_inode() to prevent further
> operations on the inconsistent inode.
>
> Reported-by: syzbot+4d8e30dbafb5c1260479@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=4d8e30dbafb5c1260479
> Fixes: 519b078998ce ("fs/ntfs3: Exclude call make_bad_inode for live nodes.")
> Signed-off-by: Helen Koike <koike@igalia.com>
> ---
>   fs/ntfs3/frecord.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
> index 7b035da63c12..78eb065c7e43 100644
> --- a/fs/ntfs3/frecord.c
> +++ b/fs/ntfs3/frecord.c
> @@ -2800,8 +2800,8 @@ int ni_rename(struct ntfs_inode *dir_ni, struct ntfs_inode *new_dir_ni,
>   	err = ni_add_name(new_dir_ni, ni, new_de);
>   	if (!err) {
>   		err = ni_remove_name(dir_ni, ni, de, &de2, &undo);
> -		WARN_ON(err &&
> -			ni_remove_name(new_dir_ni, ni, new_de, &de2, &undo));
> +		if (err && ni_remove_name(new_dir_ni, ni, new_de, &de2, &undo))
> +			_ntfs_bad_inode(&ni->vfs_inode);
>   	}
>   
>   	/*

Hello,

Your patch was applied, thanks.

Regards,
Konstantin