Skip to contentSkip to conversation

fs/gfs2/rgrp.c:1946 gfs2_inplace_reserve() warn: variable dereferenced before check 'ap' (see line 1938)

PATCH New Steven Whitehouse 2 participants 2 messages Dec 4, 2013 3 messages not in the archive GFS2 file system

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20131203101239.GM5443@mwanda

A message that is not in the archive (sent off-list or not yet received): 1386067565.2705.4.camel@menhir

A message that is not in the archive (sent off-list or not yet received): 20131203110141.GO5443@mwanda

#3 lore raw

PATCH 3/5 fs/gfs2/rgrp.c:1946 gfs2_inplace_reserve() warn: variable dereferenced before check 'ap' (see line 1938)

Hi,

On Tue, 2013-12-03 at 14:01 +0300, Dan Carpenter wrote:
[snip]

Quoted 10 lines
Quoted 10 lines
Quoted 8 lines
90306c41 Benjamin Marzinski 2012-05-29  1939  				}
90306c41 Benjamin Marzinski 2012-05-29  1940  			}
292c8c14 Abhijith Das       2007-11-29  1941  		}
666d1d8a Bob Peterson       2012-06-13  1942  
c743ffd0 Steven Whitehouse  2012-08-25  1943  		/* Skip unuseable resource groups */
2d7e8aac Bob Peterson       2013-11-25  1944  		if ((rs->rs_rbm.rgd->rd_flags & (GFS2_RGF_NOALLOC |
2d7e8aac Bob Peterson       2013-11-25  1945  						 GFS2_RDF_ERROR)) ||

2d7e8aac Bob Peterson 2013-11-25 @1946 (ap && (ap->target > rs->rs_rbm.rgd->rd_extfail_pt)))

... and this looks ok to me.

Quoted 8 lines
Quoted 1 line

Can you give some more detail as to whats wrong here?

The check that was introduced could be removed because this function is always called with a valid "ap" and we dereferenced it already.

regards,
dan carpenter

Ah, now I see what it is referring to. How does the following look as a fix?

From c599ca2dc6f554a3042e83026b3ecf3441988915 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[email protected]>
Date: Wed, 4 Dec 2013 11:14:05 +0000
Subject: [PATCH] GFS2: Remove test which is always true

Since gfs2_inplace_reserve() is always called with a valid alloc parms structure, there is no need to test for this within the function itself - and in any case, after we've all ready dereferenced it anyway.

fs/gfs2/rgrp.c +1 -1
index 797f1d3..2584710 100644
@@ -1943,7 +1943,7 @@ int gfs2_inplace_reserve(struct gfs2_inode *ip, const struct gfs2_alloc_parms *a
 		/* Skip unuseable resource groups */
 		if ((rs->rs_rbm.rgd->rd_flags & (GFS2_RGF_NOALLOC |
 						 GFS2_RDF_ERROR)) ||
-		    (ap && (ap->target > rs->rs_rbm.rgd->rd_extfail_pt)))
+		    (ap->target > rs->rs_rbm.rgd->rd_extfail_pt))
 			goto skip_rgrp;
 
 		if (sdp->sd_args.ar_rgrplvb)
Signature · 1 line
1.8.3.1
#4 lore raw

PATCH 3/5 fs/gfs2/rgrp.c:1946 gfs2_inplace_reserve() warn: variable dereferenced before check 'ap' (see line 1938)

Quoted 19 lines · Steven Whitehouse

Hi,

On Tue, 2013-12-03 at 14:01 +0300, Dan Carpenter wrote:
[snip]

Quoted 15 lines
Quoted 11 lines
Quoted 8 lines
90306c41 Benjamin Marzinski 2012-05-29  1939  				}
90306c41 Benjamin Marzinski 2012-05-29  1940  			}
292c8c14 Abhijith Das       2007-11-29  1941  		}
666d1d8a Bob Peterson       2012-06-13  1942  
c743ffd0 Steven Whitehouse  2012-08-25  1943  		/* Skip unuseable resource groups */
2d7e8aac Bob Peterson       2013-11-25  1944  		if ((rs->rs_rbm.rgd->rd_flags & (GFS2_RGF_NOALLOC |
2d7e8aac Bob Peterson       2013-11-25  1945  						 GFS2_RDF_ERROR)) ||

2d7e8aac Bob Peterson 2013-11-25 @1946 (ap && (ap->target > rs->rs_rbm.rgd->rd_extfail_pt)))

... and this looks ok to me.

Can you give some more detail as to whats wrong here?

The check that was introduced could be removed because this function is always called with a valid "ap" and we dereferenced it already.

Quoted 7 lines
Quoted 3 lines

regards,
dan carpenter

Ah, now I see what it is referring to. How does the following look as a fix?

Perfect.

regards,
dan carpenter