[PATCH 4.4 82/86] hpfs: fix remount failure when there are no options changed

From: Greg Kroah-Hartman
Date: Mon May 30 2016 - 16:53:43 EST

4.4-stable review patch. If anyone has any objections, please let me know.


From: Mikulas Patocka <mikulas@xxxxxxxxxxxxx>

commit 44d51706b4685f965cd32acde3fe0fcc1e6198e8 upstream.

Commit ce657611baf9 ("hpfs: kstrdup() out of 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

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: ce657611baf9 ("hpfs: kstrdup() out of memory handling")
Signed-off-by: Mikulas Patocka <mpatocka@xxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

fs/hpfs/super.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -455,7 +455,7 @@ static int hpfs_remount_fs(struct super_
struct hpfs_sb_info *sbi = hpfs_sb(s);
char *new_opts = kstrdup(data, GFP_KERNEL);

- if (!new_opts)
+ if (data && !new_opts)
return -ENOMEM;

@@ -493,7 +493,8 @@ static int hpfs_remount_fs(struct super_

if (!(*flags & MS_RDONLY)) mark_dirty(s, 1);

- replace_mount_options(s, new_opts);
+ if (new_opts)
+ replace_mount_options(s, new_opts);

return 0;