hpfs: fix remount failure when there are no options changed

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
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: ce657611baf9 ("hpfs: kstrdup() out of memory handling")
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Mikulas Patocka and committed by Linus Torvalds 44d51706 4029632c

Changed files
+3 -2
fs
hpfs
+3 -2
fs/hpfs/super.c
··· 455 455 struct hpfs_sb_info *sbi = hpfs_sb(s); 456 456 char *new_opts = kstrdup(data, GFP_KERNEL); 457 457 458 - if (!new_opts) 458 + if (data && !new_opts) 459 459 return -ENOMEM; 460 460 461 461 sync_filesystem(s); ··· 493 493 494 494 if (!(*flags & MS_RDONLY)) mark_dirty(s, 1); 495 495 496 - replace_mount_options(s, new_opts); 496 + if (new_opts) 497 + replace_mount_options(s, new_opts); 497 498 498 499 hpfs_unlock(s); 499 500 return 0;