[v1] f2fs: fix error handling on device alias check in rename and unlink

[PATCH] f2fs: fix error handling on device alias check in rename and unlink

Posted by Daeho Jeong 1 month, 1 week ago

From: Daeho Jeong <daehojeong@google.com>

In f2fs_rename() and f2fs_unlink(), directly returning -EPERM when
encountering a device aliasing file bypasses the cleanup path.

Fix this by setting err to -EPERM and jumping to the proper cleanup
labels (out_dir and out) instead of returning immediately.

Fixes: a737e409a3d6 ("f2fs: support dynamic reserve/release for device aliasing")
Cc: stable@kernel.org
Signed-off-by: Daeho Jeong <daehojeong@google.com>
---
 fs/f2fs/namei.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 784f636244e1..b9b15c5d28de 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -571,8 +571,10 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)
 
 	trace_f2fs_unlink_enter(dir, dentry);
 
-	if (IS_DEVICE_ALIASING(inode))
-		return -EPERM;
+	if (IS_DEVICE_ALIASING(inode)) {
+		err = -EPERM;
+		goto out;
+	}
 
 	if (unlikely(f2fs_cp_error(sbi))) {
 		err = -EIO;
@@ -1025,8 +1027,10 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
 	}
 
 	if (new_inode) {
-		if (IS_DEVICE_ALIASING(new_inode))
-			return -EPERM;
+		if (IS_DEVICE_ALIASING(new_inode)) {
+			err = -EPERM;
+			goto out_dir;
+		}
 
 		err = -ENOTEMPTY;
 		if (old_is_dir && !f2fs_empty_dir(new_inode))
-- 
2.55.0.766.g2966f0265a-goog

Re: [PATCH] f2fs: fix error handling on device alias check in rename and unlink

Posted by Christophe JAILLET 1 month, 1 week ago

Le 21/08/2026 à 03:18, Daeho Jeong a écrit :
> From: Daeho Jeong <daehojeong@google.com>
> 
> In f2fs_rename() and f2fs_unlink(), directly returning -EPERM when
> encountering a device aliasing file bypasses the cleanup path.
> 
> Fix this by setting err to -EPERM and jumping to the proper cleanup
> labels (out_dir and out) instead of returning immediately.
> 
> Fixes: a737e409a3d6 ("f2fs: support dynamic reserve/release for device aliasing")
> Cc: stable@kernel.org
> Signed-off-by: Daeho Jeong <daehojeong@google.com>

Hi,
if possible, a

Reported-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

would be appreciated.

CJ> ---
>   fs/f2fs/namei.c | 12 ++++++++----
>   1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
> index 784f636244e1..b9b15c5d28de 100644
> --- a/fs/f2fs/namei.c
> +++ b/fs/f2fs/namei.c
> @@ -571,8 +571,10 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)
>   
>   	trace_f2fs_unlink_enter(dir, dentry);
>   
> -	if (IS_DEVICE_ALIASING(inode))
> -		return -EPERM;
> +	if (IS_DEVICE_ALIASING(inode)) {
> +		err = -EPERM;
> +		goto out;
> +	}
>   
>   	if (unlikely(f2fs_cp_error(sbi))) {
>   		err = -EIO;
> @@ -1025,8 +1027,10 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
>   	}
>   
>   	if (new_inode) {
> -		if (IS_DEVICE_ALIASING(new_inode))
> -			return -EPERM;
> +		if (IS_DEVICE_ALIASING(new_inode)) {
> +			err = -EPERM;
> +			goto out_dir;
> +		}
>   
>   		err = -ENOTEMPTY;
>   		if (old_is_dir && !f2fs_empty_dir(new_inode))

Re: [f2fs-dev] [PATCH] f2fs: fix error handling on device alias check in rename and unlink

Posted by Chao Yu 1 month, 1 week ago

On 8/21/26 09:18, Daeho Jeong wrote:
> From: Daeho Jeong <daehojeong@google.com>
> 
> In f2fs_rename() and f2fs_unlink(), directly returning -EPERM when
> encountering a device aliasing file bypasses the cleanup path.
> 
> Fix this by setting err to -EPERM and jumping to the proper cleanup
> labels (out_dir and out) instead of returning immediately.
> 
> Fixes: a737e409a3d6 ("f2fs: support dynamic reserve/release for device aliasing")
> Cc: stable@kernel.org
> Signed-off-by: Daeho Jeong <daehojeong@google.com>

Reviewed-by: Chao Yu <chao@kernel.org>

Thanks,