diff options
| author | Zhang Yi <yi.zhang@huawei.com> | 2024-02-20 03:49:03 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2024-02-25 21:30:15 +0100 |
| commit | 7f174ae4f39e8475adcc09d26c5a43394689ad6c (patch) | |
| tree | c7fa104ddeefc3e76a563fb0c83c492e78d2182c | |
| parent | ubifs: Remove unreachable code in dbg_check_ltab_lnum (diff) | |
| download | linux-7f174ae4f39e8475adcc09d26c5a43394689ad6c.tar.xz linux-7f174ae4f39e8475adcc09d26c5a43394689ad6c.zip | |
ubi: correct the calculation of fastmap size
Now that the calculation of fastmap size in ubi_calc_fm_size() is
incorrect since it miss each user volume's ubi_fm_eba structure and the
Internal UBI volume info. Let's correct the calculation.
Cc: stable@vger.kernel.org
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | drivers/mtd/ubi/fastmap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 2a728c31e6b8..9a4940874be5 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -85,9 +85,10 @@ size_t ubi_calc_fm_size(struct ubi_device *ubi) sizeof(struct ubi_fm_scan_pool) + sizeof(struct ubi_fm_scan_pool) + (ubi->peb_count * sizeof(struct ubi_fm_ec)) + - (sizeof(struct ubi_fm_eba) + - (ubi->peb_count * sizeof(__be32))) + - sizeof(struct ubi_fm_volhdr) * UBI_MAX_VOLUMES; + ((sizeof(struct ubi_fm_eba) + + sizeof(struct ubi_fm_volhdr)) * + (UBI_MAX_VOLUMES + UBI_INT_VOL_COUNT)) + + (ubi->peb_count * sizeof(__be32)); return roundup(size, ubi->leb_size); } |