summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/dir.c
diff options
context:
space:
mode:
authorSteven Whitehouse2006-07-17 15:32:37 +0200
committerSteven Whitehouse2006-07-17 15:32:37 +0200
commit634ee0b9f458f3530b9c0ea7e6951dd03db7d678 (patch)
tree5d4ce77d3f7104957a220c39bdc99d4d07ce8082 /fs/gfs2/dir.c
parentMerge branch 'master' (diff)
downloadkernel-qcow2-linux-634ee0b9f458f3530b9c0ea7e6951dd03db7d678.tar.gz
kernel-qcow2-linux-634ee0b9f458f3530b9c0ea7e6951dd03db7d678.tar.xz
kernel-qcow2-linux-634ee0b9f458f3530b9c0ea7e6951dd03db7d678.zip
[GFS2] Fix use after free bug in dir.c
Fix a use after free bug in dir.c spotted by Kevin Anderson. Cc: Kevin Anderson <kanderso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/dir.c')
-rw-r--r--fs/gfs2/dir.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index e96b5322c843..f62223b9e53d 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1763,9 +1763,8 @@ static int foreach_leaf(struct gfs2_inode *dip, leaf_call_t lc, void *data)
if (error)
goto out;
leaf = (struct gfs2_leaf *)bh->b_data;
- brelse(bh);
-
len = 1 << (dip->i_di.di_depth - be16_to_cpu(leaf->lf_depth));
+ brelse(bh);
error = lc(dip, index, len, leaf_no, data);
if (error)
@@ -1781,7 +1780,7 @@ static int foreach_leaf(struct gfs2_inode *dip, leaf_call_t lc, void *data)
error = -EIO;
}
- out:
+out:
kfree(lp);
return error;