Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/btrfs/super.c

+3 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, 
		struct btrfs_fs_devices **fs_devices)

{

	substring_t args[MAX_OPT_ARGS];

	char *opts, *p;

	char *opts, *orig, *p;

	int error = 0;

	int intarg;
@@ -291,6 +291,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, 
	opts = kstrdup(options, GFP_KERNEL);

	if (!opts)

		return -ENOMEM;

	orig = opts;



	while ((p = strsep(&opts, ",")) != NULL) {

		int token;
@@ -326,7 +327,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, 
	}



 out_free_opts:

	kfree(opts);

	kfree(orig);

 out:

	/*

	 * If no subvolume name is specified we use the default one.  Allocate