summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rix <trix@redhat.com>2022-12-30 12:53:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-09-13 09:43:05 +0200
commit41cb5369cb8042a8490f619340c5e98a512ddfd7 (patch)
tree77ab881a0acaa7e19f25c39a5730efd84f858a42
parentc74b1cd93f260d9691a17fce33553bb87341c9e2 (diff)
downloadlinux-stable-41cb5369cb8042a8490f619340c5e98a512ddfd7.tar.gz
linux-stable-41cb5369cb8042a8490f619340c5e98a512ddfd7.tar.bz2
linux-stable-41cb5369cb8042a8490f619340c5e98a512ddfd7.zip
udf: initialize newblock to 0
commit 23970a1c9475b305770fd37bebfec7a10f263787 upstream. 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") Reported-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Tom Rix <trix@redhat.com> Signed-off-by: Jan Kara <jack@suse.cz> Message-Id: <20221230175341.1629734-1-trix@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/udf/inode.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 1cdad5e9950b..b574c2a9ce7b 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -696,7 +696,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);
@@ -799,7 +799,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;
@@ -862,7 +861,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)