From: Gao Xiang <hsiangkao@linux.alibaba.com>
Date: Sat, 5 Apr 2025 18:57:07 +0000 (+0800)
Subject: erofs-utils: lib: fix two integer handling issues
X-Git-Tag: accepted/tizen/unified/20250610.081809~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e01b4739ddd5b22a0cb00c5699c4dd10cac2366f;p=platform%2Fupstream%2Ferofs-utils.git

erofs-utils: lib: fix two integer handling issues

Coverity-id: 548918
Coverity-id: 548919
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20250405185707.3202298-4-hsiangkao@linux.alibaba.com
---

diff --git a/lib/compress.c b/lib/compress.c
index a7d5e53..9f71022 100644
--- a/lib/compress.c
+++ b/lib/compress.c
@@ -1169,7 +1169,7 @@ int erofs_commit_compressed_file(struct z_erofs_compress_ictx *ictx,
 
 	/* fall back to no compression mode */
 	DBG_BUGON(pstart < (!!inode->idata_size) << bbits);
-	ptotal -= (!!inode->idata_size) << bbits;
+	ptotal -= (u64)(!!inode->idata_size) << bbits;
 
 	compressmeta = z_erofs_write_indexes(ictx);
 	if (!compressmeta) {
@@ -1687,7 +1687,7 @@ int erofs_write_compressed_file(struct z_erofs_compress_ictx *ictx)
 		ret = PTR_ERR(bh);
 		goto err_free_idata;
 	}
-	pstart = erofs_mapbh(NULL, bh->block) << sbi->blkszbits;
+	pstart = erofs_pos(sbi, erofs_mapbh(NULL, bh->block));
 
 	ictx->seg_num = 1;
 	sctx = (struct z_erofs_compress_sctx) {