From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 15 Oct 2012 12:14:39 +0100
Subject: [Cluster-devel] [PATCH 1/3] gfs2: Fix an unchecked error from
 gfs2_rs_alloc
In-Reply-To: <1350056710-25376-1-git-send-email-anprice@redhat.com>
References: <1350056710-25376-1-git-send-email-anprice@redhat.com>
Message-ID: <1350299679.2733.46.camel@menhir>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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