From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 1/3] gfs2: Fix an unchecked error from gfs2_rs_alloc
Date: Mon, 15 Oct 2012 12:14:39 +0100 [thread overview]
Message-ID: <1350299679.2733.46.camel@menhir> (raw)
In-Reply-To: <1350056710-25376-1-git-send-email-anprice@redhat.com>
Hi,
All 3 patches now in the -nmw tree. Thanks,
Steve.
On Fri, 2012-10-12 at 16:45 +0100, Andrew Price wrote:
> Check the return value of gfs2_rs_alloc(ip) and avoid a possible null
> pointer dereference.
>
> Signed-off-by: Andrew Price <anprice@redhat.com>
> ---
> fs/gfs2/quota.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> 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;
>
prev parent reply other threads:[~2012-10-15 11:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 15:45 [Cluster-devel] [PATCH 1/3] gfs2: Fix an unchecked error from gfs2_rs_alloc Andrew Price
2012-10-15 11:14 ` Steven Whitehouse [this message]
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=1350299679.2733.46.camel@menhir \
--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).