summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2011-11-08 16:47:55 +0200
committerIlya Dryomov <idryomov@gmail.com>2011-11-09 22:53:38 +0200
commita90e8b6fb80db43b029e1e76205452afa8bdc77a (patch)
tree98a546a79e439f984f43c15f1cd6fecc8a082412 /fs
parent7fd2ae21a42d178982679b86086661292b4afe4a (diff)
downloadlinux-3.10-a90e8b6fb80db43b029e1e76205452afa8bdc77a.tar.gz
linux-3.10-a90e8b6fb80db43b029e1e76205452afa8bdc77a.tar.bz2
linux-3.10-a90e8b6fb80db43b029e1e76205452afa8bdc77a.zip
Btrfs: fix memory leak in btrfs_parse_early_options()
Don't leak subvol_name string in case multiple subvol= options are given. "The lastest option is effective" behavior (consistent with subvolid= and subvolrootid= options) is preserved. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/super.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index dcd5aef6b61..6befcaf253b 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -448,6 +448,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
token = match_token(p, tokens, args);
switch (token) {
case Opt_subvol:
+ kfree(*subvol_name);
*subvol_name = match_strdup(&args[0]);
break;
case Opt_subvolid: