diff options
| author | Dave Jones <davej@redhat.com> | 2013-10-10 20:05:35 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-22 08:41:44 +0100 |
| commit | 546a50594e6241e2002cddbef7c350e177e08e52 (patch) | |
| tree | 2f60bc76b228dc89e0266d48029ce1138f186c9e | |
| parent | 0ffc34c0d09a7d36ff84d1ac506a352a06ef5e4e (diff) | |
| download | linux-stable-546a50594e6241e2002cddbef7c350e177e08e52.tar.gz linux-stable-546a50594e6241e2002cddbef7c350e177e08e52.tar.bz2 linux-stable-546a50594e6241e2002cddbef7c350e177e08e52.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>
| -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 c2865cc3101e..8f797ae58812 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1271,6 +1271,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; |