From: Hu Weiwen <sehuww@mail.scut.edu.cn>
To: Gao Xiang <hsiangkao@aol.com>, linux-erofs@lists.ozlabs.org
Cc: Hu Weiwen <sehuww@mail.scut.edu.cn>
Subject: [PATCH] erofs-utils: fix battach on full buffer block
Date: Mon, 18 Jan 2021 20:39:45 +0800 [thread overview]
Message-ID: <20210118123945.23676-1-sehuww@mail.scut.edu.cn> (raw)
When __erofs_battach() is called on an buffer block of which
(bb->buffers.off % EROFS_BLKSIZ == 0), `tail_blkaddr' will not be
updated correctly. This bug can be reproduced by:
mkdir bug-repo
head -c 4032 /dev/urandom > bug-repo/1
head -c 4095 /dev/urandom > bug-repo/2
head -c 12345 /dev/urandom > bug-repo/3 # arbitrary size
mkfs.erofs -Eforce-inode-compact bug-repo.erofs.img bug-repo
Then mount this image and see that file `3' in the image is different
from `bug-repo/3'.
This patch fix this by:
* Don't inline tail-end data in this case, since the tail-end data will
be in a different block from inode.
* Correctly handle `battach' in this case.
Signed-off-by: Hu Weiwen <sehuww@mail.scut.edu.cn>
---
lib/cache.c | 4 ++--
lib/inode.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/cache.c b/lib/cache.c
index 9e65429..464a43c 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -102,7 +102,7 @@ static int __erofs_battach(struct erofs_buffer_block *bb,
bool dryrun)
{
const erofs_off_t alignedoffset = roundup(bb->buffers.off, alignsize);
- const int oob = cmpsgn(roundup(bb->buffers.off % EROFS_BLKSIZ,
+ const int oob = cmpsgn(roundup((bb->buffers.off - 1) % EROFS_BLKSIZ + 1,
alignsize) + incr + extrasize,
EROFS_BLKSIZ);
bool tailupdate = false;
@@ -134,7 +134,7 @@ static int __erofs_battach(struct erofs_buffer_block *bb,
tail_blkaddr = blkaddr + BLK_ROUND_UP(bb->buffers.off);
erofs_bupdate_mapped(bb);
}
- return (alignedoffset + incr) % EROFS_BLKSIZ;
+ return (alignedoffset + incr - 1) % EROFS_BLKSIZ + 1;
}
int erofs_bh_balloon(struct erofs_buffer_head *bh, erofs_off_t incr)
diff --git a/lib/inode.c b/lib/inode.c
index 4ed6aed..d6a64cc 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -531,7 +531,7 @@ int erofs_prepare_tail_block(struct erofs_inode *inode)
}
/* expend a block as the tail block (should be successful) */
ret = erofs_bh_balloon(bh, EROFS_BLKSIZ);
- DBG_BUGON(ret);
+ DBG_BUGON(ret < 0);
return 0;
}
--
2.30.0
next reply other threads:[~2021-01-18 12:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 12:39 Hu Weiwen [this message]
2021-01-18 13:59 ` [PATCH] erofs-utils: fix battach on full buffer block Gao Xiang
2021-01-18 15:52 ` 胡玮文
2021-01-18 23:28 ` Gao Xiang
2021-01-19 6:02 ` 胡玮文
2021-01-19 15:43 ` Gao Xiang
2021-01-20 4:57 ` 胡玮文
2021-01-20 5:12 ` Gao Xiang
2021-01-21 6:07 ` 胡玮文
2021-01-21 7:22 ` 胡玮文
2021-01-21 9:22 ` Gao Xiang
2021-01-21 16:26 ` [PATCH v2] " Hu Weiwen
2021-01-22 2:31 ` Gao Xiang
2021-01-22 12:43 ` Gao Xiang
2021-02-14 15:22 ` Gao Xiang via Linux-erofs
2021-02-14 16:00 ` [PATCH v3] erofs-utils: fix battach on full buffer blocks Gao Xiang via Linux-erofs
2021-02-22 15:34 ` Li GuiFu via Linux-erofs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210118123945.23676-1-sehuww@mail.scut.edu.cn \
--to=sehuww@mail.scut.edu.cn \
--cc=hsiangkao@aol.com \
--cc=linux-erofs@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).