diff options
author | Andrew Price <anprice@redhat.com> | 2012-10-12 17:45:08 +0200 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-11-07 10:40:05 +0100 |
commit | aaaf68c5629108f6078ab458d34a661143ea6857 (patch) | |
tree | 9a5e5a44d4aee71d25af98fac75cd689db41e6ff /fs/gfs2 | |
parent | Linux 3.7-rc1 (diff) | |
download | linux-aaaf68c5629108f6078ab458d34a661143ea6857.tar.xz linux-aaaf68c5629108f6078ab458d34a661143ea6857.zip |
GFS2: Fix an unchecked error from gfs2_rs_alloc
Check the return value of gfs2_rs_alloc(ip) and avoid a possible null
pointer dereference.
Signed-off-by: Andrew Price <anprice@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/quota.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 40c4b0d42fa8..c5af8e18f27a 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -497,8 +497,11 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid) struct gfs2_quota_data **qd; int error; - if (ip->i_res == NULL) - gfs2_rs_alloc(ip); + if (ip->i_res == NULL) { + error = gfs2_rs_alloc(ip); + if (error) + return error; + } qd = ip->i_res->rs_qa_qd; |