diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2011-11-09 12:54:43 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2011-11-09 12:54:43 +0000 |
| commit | 114b80ce2c05f91f10fffbf303080357d73c0675 (patch) | |
| tree | 3a4804a7cf7515d07baf9fbf899c07c95297f6ce /fs/gfs2 | |
| parent | 87654896ca619ff64f94d3881d6bd0ec7b29e25f (diff) | |
| download | linux-114b80ce2c05f91f10fffbf303080357d73c0675.tar.bz2 | |
GFS2: Fix very unlikley memory leak in ACL xattr code
This was spotted by automated code analysis. In case reading
an ACL xattr failed (only likely to happen if there is an I/O
error for example, and even then only with unstuffed xattrs,
so pretty difficult to trigger) a small amount of memory could
potentially be leaked.
This patch adds a kfree to the error path, and also removes a
test which is no longer required (gfs2_ea_get_copy always
returns either a negative error, or a length)
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/xattr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c index 71d7bf830c09..a201a1d57a6d 100644 --- a/fs/gfs2/xattr.c +++ b/fs/gfs2/xattr.c @@ -549,9 +549,10 @@ int gfs2_xattr_acl_get(struct gfs2_inode *ip, const char *name, char **ppdata) goto out; error = gfs2_ea_get_copy(ip, &el, data, len); - if (error == 0) - error = len; - *ppdata = data; + if (error < 0) + kfree(data); + else + *ppdata = data; out: brelse(el.el_bh); return error; |