Commit 3f3d0bc0 authored by Tero Roponen's avatar Tero Roponen Committed by Li Zefan

Btrfs: Free correct pointer after using strsep

We must save and free the original kstrdup()'ed pointer
because strsep() modifies its first argument.
Signed-off-by: default avatarTero Roponen <tero.roponen@gmail.com>
Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
parent bdc924bb
...@@ -277,7 +277,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, ...@@ -277,7 +277,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
struct btrfs_fs_devices **fs_devices) struct btrfs_fs_devices **fs_devices)
{ {
substring_t args[MAX_OPT_ARGS]; substring_t args[MAX_OPT_ARGS];
char *opts, *p; char *opts, *orig, *p;
int error = 0; int error = 0;
int intarg; int intarg;
...@@ -291,6 +291,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, ...@@ -291,6 +291,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
opts = kstrdup(options, GFP_KERNEL); opts = kstrdup(options, GFP_KERNEL);
if (!opts) if (!opts)
return -ENOMEM; return -ENOMEM;
orig = opts;
while ((p = strsep(&opts, ",")) != NULL) { while ((p = strsep(&opts, ",")) != NULL) {
int token; int token;
...@@ -326,7 +327,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, ...@@ -326,7 +327,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
} }
out_free_opts: out_free_opts:
kfree(opts); kfree(orig);
out: out:
/* /*
* If no subvolume name is specified we use the default one. Allocate * If no subvolume name is specified we use the default one. Allocate
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment