diff options
| author | Navid Emamdoost <navid.emamdoost@gmail.com> | 2019-10-02 16:52:37 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-11-18 14:26:43 +0100 |
| commit | 450c3d4166837c496ebce03650c08800991f2150 (patch) | |
| tree | e278f03b2091e8d80bba63be71df2cd0765e1a4f | |
| parent | 6060c07d476ebb1f21d28db5ba852e911246ce79 (diff) | |
| download | linux-stable-450c3d4166837c496ebce03650c08800991f2150.tar.gz linux-stable-450c3d4166837c496ebce03650c08800991f2150.tar.bz2 linux-stable-450c3d4166837c496ebce03650c08800991f2150.zip | |
affs: fix a memory leak in affs_remount
In affs_remount if data is provided it is duplicated into new_opts. The
allocated memory for new_opts is only released if parse_options fails.
There's a bit of history behind new_options, originally there was
save/replace options on the VFS layer so the 'data' passed must not
change (thus strdup), this got cleaned up in later patches. But not
completely.
There's no reason to do the strdup in cases where the filesystem does
not need to reuse the 'data' again, because strsep would modify it
directly.
Fixes: c8f33d0bec99 ("affs: kstrdup() memory handling")
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
[ update changelog ]
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/affs/super.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c index 9fcff55c65af..47107c6712a6 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -561,14 +561,9 @@ affs_remount(struct super_block *sb, int *flags, char *data) int root_block; unsigned long mount_flags; int res = 0; - char *new_opts; char volume[32]; char *prefix = NULL; - new_opts = kstrdup(data, GFP_KERNEL); - if (data && !new_opts) - return -ENOMEM; - pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data); sync_filesystem(sb); @@ -579,7 +574,6 @@ affs_remount(struct super_block *sb, int *flags, char *data) &blocksize, &prefix, volume, &mount_flags)) { kfree(prefix); - kfree(new_opts); return -EINVAL; } |