diff options
| author | Dave Jones <davej@redhat.com> | 2013-10-10 20:05:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-18 07:45:44 -0700 |
| commit | cec073e269a8e8ee653ada869b96c59e8286a606 (patch) | |
| tree | b2a49a1d95a4769dbd9f88f7d61c092ba37a6c7d /fs/ext4 | |
| parent | a849b2f4200ab490d7a6d80e7632d28dc80c8f6f (diff) | |
| download | linux-3.10-cec073e269a8e8ee653ada869b96c59e8286a606.tar.gz linux-3.10-cec073e269a8e8ee653ada869b96c59e8286a606.tar.bz2 linux-3.10-cec073e269a8e8ee653ada869b96c59e8286a606.zip | |
ext4: fix memory leak in xattr
commit 6e4ea8e33b2057b85d75175dd89b93f5e26de3bc upstream.
If we take the 2nd retry path in ext4_expand_extra_isize_ea, we
potentionally return from the function without having freed these
allocations. If we don't do the return, we over-write the previous
allocation pointers, so we leak either way.
Spotted with Coverity.
[ Fixed by tytso to set is and bs to NULL after freeing these
pointers, in case in the retry loop we later end up triggering an
error causing a jump to cleanup, at which point we could have a double
free bug. -- Ted ]
Signed-off-by: Dave Jones <davej@fedoraproject.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/xattr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index c081e34f717..03e9bebba19 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1350,6 +1350,8 @@ retry: s_min_extra_isize) { tried_min_extra_isize++; new_extra_isize = s_min_extra_isize; + kfree(is); is = NULL; + kfree(bs); bs = NULL; goto retry; } error = -1; |