[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20130922193335.GA3797@thunk.org>
Date: Sun, 22 Sep 2013 15:33:35 -0400
From: Theodore Ts'o <tytso@....edu>
To: Eric Sandeen <sandeen@...hat.com>
Cc: Dave Jones <davej@...hat.com>,
Andreas Dilger <adilger.kernel@...ger.ca>,
linux-ext4@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: ext4: fix memory leak in xattr code.
Thanks, applied with a minor bug fix...
- Ted
commit 8484764f97a840df851f4586079f28715f13318e
Author: Dave Jones <davej@...hat.com>
Date: Sun Sep 22 15:31:00 2013 -0400
ext4: fix memory leak in xattr
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@...oraproject.org>
Signed-off-by: "Theodore Ts'o" <tytso@....edu>
Reviewed-by: Eric Sandeen <sandeen@...hat.com>
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index c081e34..3c53192 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1350,6 +1350,9 @@ retry:
s_min_extra_isize) {
tried_min_extra_isize++;
new_extra_isize = s_min_extra_isize;
+ kfree(is);
+ kfree(bs);
+ is = bs = NULL;
goto retry;
}
error = -1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists