UBI: Fix crash in try_recover_peb()

geertu · richardweinberger · commit 884a3b647809 · 2016-10-20T00:06:06.000+02:00
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: 3291b52 ("UBI: introduce the VID buffer concept") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Richard Weinberger <richard@nod.at>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -741,6 +741,7 @@ static int try_recover_peb(struct ubi_volume *vol, int pnum, int lnum,`
`741`	`741`	`goto out_put;`
`742`	`742`	`}`
`743`	`743`
	`744`	`+ vid_hdr = ubi_get_vid_hdr(vidb);`
`744`	`745`	`ubi_assert(vid_hdr->vol_type == UBI_VID_DYNAMIC);`
`745`	`746`
`746`	`747`	`mutex_lock(&ubi->buf_mutex);`