cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 1/7] GFS2: Fix an unchecked error from gfs2_rs_alloc
Date: Wed,  7 Nov 2012 10:15:53 +0000	[thread overview]
Message-ID: <1352283359-3314-2-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1352283359-3314-1-git-send-email-swhiteho@redhat.com>

From: Andrew Price <anprice@redhat.com>

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 40c4b0d..c5af8e1 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;
 
-- 
1.7.4



  reply	other threads:[~2012-11-07 10:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-07 10:15 [Cluster-devel] GFS2: Pre-pull patch posting (fixes) Steven Whitehouse
2012-11-07 10:15 ` Steven Whitehouse [this message]
2012-11-07 10:15 ` [Cluster-devel] [PATCH 2/7] GFS2: Fix possible null pointer deref in gfs2_rs_alloc Steven Whitehouse
2012-11-07 10:15 ` [Cluster-devel] [PATCH 3/7] GFS2: Clean up some unused assignments Steven Whitehouse
2012-11-07 10:15 ` [Cluster-devel] [PATCH 4/7] GFS2: Require user to provide argument for FITRIM Steven Whitehouse
2012-11-07 10:15 ` [Cluster-devel] [PATCH 5/7] GFS2: Fix FITRIM argument handling Steven Whitehouse
2012-11-07 10:15 ` [Cluster-devel] [PATCH 6/7] GFS2: Don't call file_accessed() with a shared glock Steven Whitehouse
2012-11-07 10:15 ` [Cluster-devel] [PATCH 7/7] GFS2: Test bufdata with buffer locked and gfs2_log_lock held Steven Whitehouse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1352283359-3314-2-git-send-email-swhiteho@redhat.com \
    --to=swhiteho@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).