From: Andrew Price <anprice@redhat.com>
Date: Fri, 12 Oct 2012 15:45:08 +0000 (+0100)
Subject: GFS2: Fix an unchecked error from gfs2_rs_alloc
X-Git-Tag: v3.7-rc5~18^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=aaaf68c5629108f6078ab458d34a661143ea6857;p=~emulex%2Finfiniband.git

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>
---

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 40c4b0d42fa..c5af8e18f27 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;