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

Commit da495ecc authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: kfree correct pointer during mount option parsing 



We kstrdup the options string, but then strsep screws with the pointer,
so when we kfree() it, we're not giving it the right pointer.

Tested-by: default avatarAndy Lutomirski <luto@mit.edu>

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 6bef4d31

fs/btrfs/super.c

+3 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
{

	struct btrfs_fs_info *info = root->fs_info;

	substring_t args[MAX_OPT_ARGS];

	char *p, *num;

	char *p, *num, *orig;

	int intarg;

	int ret = 0;
@@ -143,6 +143,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
	if (!options)

		return -ENOMEM;



	orig = options;



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

		int token;
@@ -280,7 +281,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
		}

	}

out:

	kfree(options);

	kfree(orig);

	return ret;

}