request for 4.14-stable: 25677478474a ("ubi: Initialize Fastmap checkmapping correctly")

request for 4.14-stable: 25677478474a ("ubi: Initialize Fastmap checkmapping correctly")

[Sudip Mukherjee]

[-- Attachment #1: Type: text/plain, Size: 117 bytes --]

Hi Greg,

This was not marked for stable but the commit which it fixes has been
added to v4.14.85.

--
Regards
Sudip

[-- Attachment #2: 0001-ubi-Initialize-Fastmap-checkmapping-correctly.patch --]
[-- Type: text/x-diff, Size: 2029 bytes --]

>From a72f2dedb99e9839029091930865dadfd52372b7 Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Tue, 12 Jun 2018 09:33:16 +0200
Subject: [PATCH] ubi: Initialize Fastmap checkmapping correctly

commit 25677478474a91fa1b46f19a4a591a9848bca6fb upstream

We cannot do it last, otherwithse it will be skipped for dynamic
volumes.

Reported-by: Lachmann, Juergen <juergen.lachmann@harman.com>
Fixes: 34653fd8c46e ("ubi: fastmap: Check each mapping only once")
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
 drivers/mtd/ubi/vtbl.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 94d7a865b135..7504f430c011 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -579,6 +579,16 @@ static int init_volumes(struct ubi_device *ubi,
 		reserved_pebs += vol->reserved_pebs;
 
 		/*
+		 * We use ubi->peb_count and not vol->reserved_pebs because
+		 * we want to keep the code simple. Otherwise we'd have to
+		 * resize/check the bitmap upon volume resize too.
+		 * Allocating a few bytes more does not hurt.
+		 */
+		err = ubi_fastmap_init_checkmap(vol, ubi->peb_count);
+		if (err)
+			return err;
+
+		/*
 		 * In case of dynamic volume UBI knows nothing about how many
 		 * data is stored there. So assume the whole volume is used.
 		 */
@@ -620,16 +630,6 @@ static int init_volumes(struct ubi_device *ubi,
 			(long long)(vol->used_ebs - 1) * vol->usable_leb_size;
 		vol->used_bytes += av->last_data_size;
 		vol->last_eb_bytes = av->last_data_size;
-
-		/*
-		 * We use ubi->peb_count and not vol->reserved_pebs because
-		 * we want to keep the code simple. Otherwise we'd have to
-		 * resize/check the bitmap upon volume resize too.
-		 * Allocating a few bytes more does not hurt.
-		 */
-		err = ubi_fastmap_init_checkmap(vol, ubi->peb_count);
-		if (err)
-			return err;
 	}
 
 	/* And add the layout volume */
-- 
2.11.0

Re: request for 4.14-stable: 25677478474a ("ubi: Initialize Fastmap checkmapping correctly")

[Sasha Levin]

On Sat, Dec 01, 2018 at 07:47:49PM +0000, Sudip Mukherjee wrote:
>Hi Greg,
>
>This was not marked for stable but the commit which it fixes has been
>added to v4.14.85.

Queued for 4.14, thank you.

--
Thanks,
Sasha