Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5cb3ec3d605ba80d0f33968d54bf85875d427161

Authored by Mikulas Patocka
Committed by Greg Kroah-Hartman
1 parent 1ba1f09456
Exists in smarct4x-processor-sdk-linux-03.00.00.04 and in 2 other branches dlt-processor-sdk-linux-03.00.00.04, smarct3x-processor-sdk-linux-03.00.00.04

hpfs: fix remount failure when there are no options changed 

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
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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

... ... @@ -455,7 +455,7 @@
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,7 +493,8 @@
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;