lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
This commit is contained in:
Jeff Liu
2011-09-14 14:11:21 +08:00
committed by David Sterba
parent 5ca496604b
commit 83c8c9bde0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/super.c
View File

@@ -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) u64 *subvol_rootid, struct btrfs_fs_devices **fs_devices)
{ {
substring_t args[MAX_OPT_ARGS]; substring_t args[MAX_OPT_ARGS];
char *opts, *orig, *p; char *device_name, *opts, *orig, *p;
int error = 0; int error = 0;
int intarg; int intarg;
@@ -470,8 +470,14 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
} }
break; break;
case Opt_device: 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); flags, holder, fs_devices);
kfree(device_name);
if (error) if (error)
goto out; goto out;
break; break;