tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

affs: fix remount failure when there are no options changed

Commit c8f33d0bec99 ("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: c8f33d0bec99 ("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>

authored by

Mikulas Patocka and committed by
Linus Torvalds 01d6e087 44d51706

+3 -2
+3 -2
fs/affs/super.c
··· 528 528 char *prefix = NULL; 529 529 530 530 new_opts = kstrdup(data, GFP_KERNEL); 531 - if (!new_opts) 531 + if (data && !new_opts) 532 532 return -ENOMEM; 533 533 534 534 pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data); ··· 546 546 } 547 547 548 548 flush_delayed_work(&sbi->sb_work); 549 - replace_mount_options(sb, new_opts); 549 + if (new_opts) 550 + replace_mount_options(sb, new_opts); 550 551 551 552 sbi->s_flags = mount_flags; 552 553 sbi->s_mode = mode;