From: Josef Bacik <josef@redhat.com>
Date: Thu, 25 Feb 2010 20:38:35 +0000 (+0000)
Subject: Btrfs: kfree correct pointer during mount option parsing
X-Git-Tag: firefly_0821_release~10186^2~1151
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=55f32f8ac693e2bb4081d7cec1144b0250182267;p=firefly-linux-kernel-4.4.55.git

Btrfs: kfree correct pointer during mount option parsing

commit da495ecc0fb096b383754952a1c152147bc95b52 upstream.

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: Andy Lutomirski <luto@mit.edu>

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Acked-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 3f9b45704fcd..a649305b2059 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -126,7 +126,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;
 
@@ -141,6 +141,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
 	if (!options)
 		return -ENOMEM;
 
+	orig = options;
 
 	while ((p = strsep(&options, ",")) != NULL) {
 		int token;
@@ -273,7 +274,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
 		}
 	}
 out:
-	kfree(options);
+	kfree(orig);
 	return ret;
 }