projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddffeb8
)
GFS2: Fix an unchecked error from gfs2_rs_alloc
author
Andrew Price
<anprice@redhat.com>
Fri, 12 Oct 2012 15:45:08 +0000
(16:45 +0100)
committer
Steven Whitehouse
<swhiteho@redhat.com>
Wed, 7 Nov 2012 09:40:05 +0000
(09:40 +0000)
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>
fs/gfs2/quota.c
patch
|
blob
|
history
diff --git
a/fs/gfs2/quota.c
b/fs/gfs2/quota.c
index 40c4b0d42fa8fea10b73102b4fd7d155ebf8daa0..c5af8e18f27af8a3b0c899ce1fe5404fede93831 100644
(file)
--- 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;