From: Jeff Liu <jeff.liu@oracle.com>
Date: Wed, 14 Sep 2011 06:11:21 +0000 (+0800)
Subject: btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()
X-Git-Tag: v3.2-rc1~21^2~23^2~13
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=83c8c9bde0add721f7509aa446455183b040b931;p=~emulex%2Finfiniband.git

btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
---

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 266d1f35465..09ce951666e 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -419,7 +419,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
 		u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
 {
 	substring_t args[MAX_OPT_ARGS];
-	char *opts, *orig, *p;
+	char *device_name, *opts, *orig, *p;
 	int error = 0;
 	int intarg;
 
@@ -470,8 +470,14 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
 			}
 			break;
 		case Opt_device:
-			error = btrfs_scan_one_device(match_strdup(&args[0]),
+			device_name = match_strdup(&args[0]);
+			if (!device_name) {
+				error = -ENOMEM;
+				goto out;
+			}
+			error = btrfs_scan_one_device(device_name,
 					flags, holder, fs_devices);
+			kfree(device_name);
 			if (error)
 				goto out;
 			break;