[PATCH] UBI: Fix crash in try_recover_peb()

From: Geert Uytterhoeven
Date: Thu Oct 13 2016 - 10:23:52 EST


drivers/mtd/ubi/eba.c: In function âtry_recover_pebâ:
drivers/mtd/ubi/eba.c:744: warning: âvid_hdrâ is used uninitialized in this function

The pointer vid_hdr is indeed not initialized, leading to a crash when
it is dereferenced.

Fix this by obtaining the pointer from the VID buffer, like is done
everywhere else.

Fixes: 3291b52f9ff0acc8 ("UBI: introduce the VID buffer concept")
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
---
Completely untested. And I know nothing about UBI ;-)
---
drivers/mtd/ubi/eba.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 95c4048a371e87b6..388e46be6ad92805 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -741,6 +741,7 @@ static int try_recover_peb(struct ubi_volume *vol, int pnum, int lnum,
goto out_put;
}

+ vid_hdr = ubi_get_vid_hdr(vidb);
ubi_assert(vid_hdr->vol_type == UBI_VID_DYNAMIC);

mutex_lock(&ubi->buf_mutex);
--
1.9.1