xfsprogs: coverity fixes
v3 cover xfsprogs: coverity fixes
Select fixes made following coverity scan results on 04/23/2024.
CID: 1596597, 1596598, 1596599, 1596600, 159660
---
v3: use %lld instead of %ld and cast howlong to (long long) in PATCH 3/4.
v2: initialize automatic struct ifake to 0 at declaration instead of
setting individual member if_levels to 0.
---
PATCH v3 1/4 mkfs.xfs: avoid potential overflowing expression in xfs_mkfs.c
Cast max_tx_bytes to uint64_t to avoid overflowing expression in calc_concurrency_logblocks().
Coverity-id: 1596603
--- mkfs/xfs_mkfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mkfs/xfs_mkfs.c +1 -1
@@ -3678,7 +3678,7 @@ calc_concurrency_logblocks(* without blocking for space. Increase the figure by 50% so that * background threads can also run. */ - log_bytes = max_tx_bytes *3 * cli->log_concurrency /2 ; + log_bytes = (uint64_t )max_tx_bytes *3 * cli->log_concurrency /2 ; new_logblocks =min (XFS_MAX_LOG_BYTES >> cfg->blocklog, log_bytes >> cfg->blocklog);
Signature · 1 line
2.45.2
PATCH v3 2/4 xfs_db: fix unitialized automatic struct ifake to 0.
In reply to Bill O'DonnellEnsure automatic struct ifake is properly initialized.
Coverity-id: 1596600, 1596597
--- db/bmap_inflate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
db/bmap_inflate.c +2 -2
@@ -340,7 +340,7 @@ build_new_datafork( const struct xfs_bmbt_irec *irec, xfs_extnum_t nextents) { -struct xbtree_ifakeroot ifake; +struct xbtree_ifakeroot ifake = {};struct xfs_btree_cur *bmap_cur;int error;
@@ -394,7 +394,7 @@ estimate_size( .leaf_slack = 1, .node_slack = 1, }; -struct xbtree_ifakeroot ifake; +struct xbtree_ifakeroot ifake = {};struct xfs_btree_cur *bmap_cur;int error;
Signature · 1 line
2.45.2
PATCH v3 3/4 xfs_fsr: correct type in fsrprintf() call
In reply to Bill O'DonnellUse %lld instead of %d for howlong variable.
Coverity-id: 1596598
--- fsr/xfs_fsr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fsr/xfs_fsr.c +2 -1
@@ -426,7 +426,8 @@ fsrallfs(char *mtab, time_t howlong, char *leftofffile)fsdesc_t *fsp;struct stat sb, sb2; -fsrprintf ("xfs_fsr -m %s -t %d -f %s ...\n" , mtab, howlong, leftofffile); +fsrprintf ("xfs_fsr -m %s -t %lld -f %s ...\n" , mtab, + (long long )howlong, leftofffile); endtime = starttime + howlong; fs = fsbase;
Signature · 1 line
2.45.2
Re: [PATCH v3 3/4] xfs_fsr: correct type in fsrprintf() call
Quoted 5 lines · Bill O'Donnell
Use %lld instead of %d for howlong variable.
Coverity-id: 1596598
Signed-off-by Bill O'Donnell <[email protected]>
Looks good:
Re: [PATCH v3 3/4] xfs_fsr: correct type in fsrprintf() call
In reply to Bill O'DonnellQuoted 5 lines · Bill O'Donnell
Use %lld instead of %d for howlong variable.
Coverity-id: 1596598
Signed-off-by Bill O'Donnell <[email protected]>
Looks good now,
--D
Quoted 22 lines
--- fsr/xfs_fsr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fsr/xfs_fsr.c +2
-1@@ -426,7 +426,8 @@ fsrallfs(char *mtab, time_t howlong, char *leftofffile)fsdesc_t *fsp;struct stat sb, sb2; -fsrprintf ("xfs_fsr -m %s -t %d -f %s ...\n" , mtab, howlong, leftofffile); +fsrprintf ("xfs_fsr -m %s -t %lld -f %s ...\n" , mtab, + (long long )howlong, leftofffile); endtime = starttime + howlong; fs = fsbase;Signature · 1 line
2.45.2
PATCH v3 4/4 xfs_repair: correct type of variable global_msgs.interval to time_t
In reply to Bill O'DonnellUse time_t instead of int for interval field.
Coverity-id: 1596599
--- repair/progress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
repair/progress.c +1 -1
@@ -91,7 +91,7 @@ typedef struct msg_block_s {uint64_t *done;uint64_t *total;int count; -int interval; +time_t interval; } msg_block_t;static msg_block_t global_msgs;
Signature · 1 line
2.45.2