Skip to content

Commit

Permalink
btrfs: trivial fix, a potential memory leak in btrfs_parse_early_opti…
Browse files Browse the repository at this point in the history
…ons()

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
  • Loading branch information
Jeff Liu authored and David Sterba committed Oct 20, 2011
1 parent 5ca4966 commit 83c8c9b
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions fs/btrfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 83c8c9b

Please sign in to comment.