From: Mike Baynton Date: Mon, 11 Nov 2024 16:48:19 +0000 (-0600) Subject: erofs-utils: mkfs: Fix input offset counting in headerball mode X-Git-Tag: accepted/tizen/unified/20250610.081809~95 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=539ad7d06bf32ae0ec0c8b83900330058d92f4a7;p=platform%2Fupstream%2Ferofs-utils.git erofs-utils: mkfs: Fix input offset counting in headerball mode When using --tar=headerball, most files included in the headerball are not included in the EROFS image. mkfs.erofs typically exits prematurely, having processed non-USTAR blocks as USTAR and believing they are end-of-archive markers. (Other failure modes are probably also possible if the input stream doesn't look like end-of-archive markers at the locations that are being read.) This is because we lost correct count of bytes that are read from the input stream when in headerball (or ddtaridx) modes. We were assuming that in these modes no data would be read following the ustar block, but in case of things like PAX headers, lots more data may be read without incrementing tar->offset. This corrects by always incrementing the offset counter, and then decrementing it again in the one case where headerballs differ - regular file data blocks are not present. Signed-off-by: Mike Baynton Link: https://lore.kernel.org/r/20241111164819.560567-1-mike@mbaynton.com Signed-off-by: Gao Xiang --- diff --git a/lib/tar.c b/lib/tar.c index b32abd4..990c6cb 100644 --- a/lib/tar.c +++ b/lib/tar.c @@ -808,13 +808,14 @@ out_eot: } dataoff = tar->offset; - if (!(tar->headeronly_mode || tar->ddtaridx_mode)) - tar->offset += st.st_size; + tar->offset += st.st_size; switch(th->typeflag) { case '0': case '7': case '1': st.st_mode |= S_IFREG; + if (tar->headeronly_mode || tar->ddtaridx_mode) + tar->offset -= st.st_size; break; case '2': st.st_mode |= S_IFLNK;