diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-05-06 12:50:11 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-07 10:28:16 -0700 |
| commit | 94d3803b8b5aff8b0a8b47116c1f1d37f75c8819 (patch) | |
| tree | fdab449b25da196efbb6c3f52a8878902342a1b9 /fs | |
| parent | 54c2a0ca8378bb0cbfbb56179c883d1bd9258cf9 (diff) | |
fs/affs/super.c: bugfix / double free
commit d353efd02357a74753cd45f367a2d3d357fd6904 upstream.
Commit 842a859db26b ("affs: use ->kill_sb() to simplify ->put_super()
and failure exits of ->mount()") adds .kill_sb which frees sbi but
doesn't remove sbi free in case of parse_options error causing double
free+random crash.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/affs/super.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c index d098731b82ff..9a5b19dc899d 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -336,8 +336,6 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) &blocksize,&sbi->s_prefix, sbi->s_volume, &mount_flags)) { printk(KERN_ERR "AFFS: Error parsing options\n"); - kfree(sbi->s_prefix); - kfree(sbi); return -EINVAL; } /* N.B. after this point s_prefix must be released */ |