]> git.baikalelectronics.ru Git - kernel.git/commit
affs: fix remount failure when there are no options changed
authorMikulas Patocka <mikulas@twibright.com>
Tue, 24 May 2016 20:48:33 +0000 (22:48 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2016 23:50:24 +0000 (16:50 -0700)
commit131c95ef4741a97096d6ed742f4296d06329c519
treea1bcc6a8ef936e0a19beef7f7befc843f1c07224
parent42038cc799fa2f3858964ae087ece2e859da852d
affs: fix remount failure when there are no options changed

Commit 25ec73b9d11d ("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: 25ec73b9d11d ("affs: kstrdup() memory handling")
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org # v4.1+
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/affs/super.c