* [Cluster-devel] [PATCH 1/3] gfs2: Fix an unchecked error from gfs2_rs_alloc
@ 2012-10-12 15:45 Andrew Price
2012-10-15 11:14 ` Steven Whitehouse
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Price @ 2012-10-12 15:45 UTC (permalink / raw)
To: cluster-devel.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>
---
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;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Cluster-devel] [PATCH 1/3] gfs2: Fix an unchecked error from gfs2_rs_alloc
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
0 siblings, 0 replies; 2+ messages in thread
From: Steven Whitehouse @ 2012-10-15 11:14 UTC (permalink / raw)
To: cluster-devel.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;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-15 11:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).