Skip to contentSkip to conversation

udf: initialize newblock to 0

PATCH In review Tom Rix 2 participants 2 messages Dec 30, 2022 – Jan 2, 2023 UDF filesystem

lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 udf: initialize newblock to 0

The clang build reports this error
fs/udf/inode.c:805:6: error: variable 'newblock' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]

        if (*err < 0)
            ^~~~~~~~

newblock is never set before error handling jump. Initialize newblock to 0 and remove redundant settings.

Fixes d8b39db5fab8 ("udf: Handle error when adding extent to a file")
---
 fs/udf/inode.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/udf/inode.c +1 -3
index 4a912e2edcec..31965c3798f2 100644
@@ -604,7 +604,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
 	struct kernel_lb_addr eloc, tmpeloc;
 	int c = 1;
 	loff_t lbcount = 0, b_off = 0;
-	udf_pblk_t newblocknum, newblock;
+	udf_pblk_t newblocknum, newblock = 0;
 	sector_t offset = 0;
 	int8_t etype;
 	struct udf_inode_info *iinfo = UDF_I(inode);
@@ -710,7 +710,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
 		ret = udf_do_extend_file(inode, &prev_epos, laarr, hole_len);
 		if (ret < 0) {
 			*err = ret;
-			newblock = 0;
 			goto out_free;
 		}
 		c = 0;
@@ -775,7 +774,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
 				goal, err);
 		if (!newblocknum) {
 			*err = -ENOSPC;
-			newblock = 0;
 			goto out_free;
 		}
 		if (isBeyondEOF)
Signature · 1 line
2.27.0
#1 lore raw
Quoted 9 lines · Tom Rix

The clang build reports this error
fs/udf/inode.c:805:6: error: variable 'newblock' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]

        if (*err < 0)
            ^~~~~~~~

newblock is never set before error handling jump. Initialize newblock to 0 and remove redundant settings.

Fixes d8b39db5fab8 ("udf: Handle error when adding extent to a file")

Thanks! I've added the patch to my tree.

Honza

Quoted 36 lines
---
 fs/udf/inode.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/udf/inode.c +1 -3
index 4a912e2edcec..31965c3798f2 100644
@@ -604,7 +604,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
 	struct kernel_lb_addr eloc, tmpeloc;
 	int c = 1;
 	loff_t lbcount = 0, b_off = 0;
-	udf_pblk_t newblocknum, newblock;
+	udf_pblk_t newblocknum, newblock = 0;
 	sector_t offset = 0;
 	int8_t etype;
 	struct udf_inode_info *iinfo = UDF_I(inode);
@@ -710,7 +710,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
 		ret = udf_do_extend_file(inode, &prev_epos, laarr, hole_len);
 		if (ret < 0) {
 			*err = ret;
-			newblock = 0;
 			goto out_free;
 		}
 		c = 0;
@@ -775,7 +774,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
 				goal, err);
 		if (!newblocknum) {
 			*err = -ENOSPC;
-			newblock = 0;
 			goto out_free;
 		}
 		if (isBeyondEOF)
Signature · 1 line
2.27.0
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR