Skip to content

Commit 01d6e08

Browse files
mikulas-patockatorvalds
authored andcommitted
affs: fix remount failure when there are no options changed
Commit c8f33d0 ("affs: kstrdup() memory handling") checks if the kstrdup function returns NULL due to out-of-memory condition. However, if we are remounting a filesystem with no change to filesystem-specific options, the parameter data is NULL. In this case, kstrdup returns NULL (because it was passed NULL parameter), although no out of memory condition exists. The mount syscall then fails with ENOMEM. This patch fixes the bug. We fail with ENOMEM only if data is non-NULL. The patch also changes the call to replace_mount_options - if we didn't pass any filesystem-specific options, we don't call replace_mount_options (thus we don't erase existing reported options). Fixes: c8f33d0 ("affs: kstrdup() memory handling") Signed-off-by: Mikulas Patocka <[email protected]> Cc: [email protected] # v4.1+ Signed-off-by: Linus Torvalds <[email protected]>
1 parent 44d5170 commit 01d6e08

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/affs/super.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ affs_remount(struct super_block *sb, int *flags, char *data)
528528
char *prefix = NULL;
529529

530530
new_opts = kstrdup(data, GFP_KERNEL);
531-
if (!new_opts)
531+
if (data && !new_opts)
532532
return -ENOMEM;
533533

534534
pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data);
@@ -546,7 +546,8 @@ affs_remount(struct super_block *sb, int *flags, char *data)
546546
}
547547

548548
flush_delayed_work(&sbi->sb_work);
549-
replace_mount_options(sb, new_opts);
549+
if (new_opts)
550+
replace_mount_options(sb, new_opts);
550551

551552
sbi->s_flags = mount_flags;
552553
sbi->s_mode = mode;

0 commit comments

Comments
 (0)