diff options
| author | Jeff Liu <jeff.liu@oracle.com> | 2011-09-14 14:11:21 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2011-10-20 18:10:38 +0200 |
| commit | 83c8c9bde0add721f7509aa446455183b040b931 (patch) | |
| tree | 0789b6246eb84e580d7c6eefe2f761314d18870a /fs | |
| parent | 5ca496604b5975d371bb669ee6c2394bcbea818f (diff) | |
| download | blackbird-op-linux-83c8c9bde0add721f7509aa446455183b040b931.tar.gz blackbird-op-linux-83c8c9bde0add721f7509aa446455183b040b931.zip | |
btrfs: trivial fix, a potential memory leak in btrfs_parse_early_options()
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 266d1f35465d..09ce951666ea 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; |
