summary refs log tree commit diff
diff options
context:
space:
mode:
authorTanya Brokhman <tlinder@codeaurora.org>2014-04-01 11:01:12 +0300
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2014-05-05 09:31:33 +0300
commit87ed89d21ede38f86be9419ca7c6dd4761764bbb (patch)
tree465df391e8858ae8575a2bf72815e4302ab83386
parentfcdd57c8902a936a616df2066d873b38ef3ed364 (diff)
downloadlinux-87ed89d21ede38f86be9419ca7c6dd4761764bbb.tar.gz
UBI: fix error path in __wl_get_peb
In case of an error (if there are not free PEB's for example),
__wl_get_peb will return a negative value. In order to prevent access
violation we need to test the returned value prior to using it later on.

Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Reviewed-by: Dolev Raviv <draviv@codeaurora.org>
Acked-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rw-r--r--drivers/mtd/ubi/wl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 02317c1c0238..457ead32105c 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -684,6 +684,9 @@ int ubi_wl_get_peb(struct ubi_device *ubi)
 	peb = __wl_get_peb(ubi);
 	spin_unlock(&ubi->wl_lock);
 
+	if (peb < 0)
+		return peb;
+
 	err = ubi_self_check_all_ff(ubi, peb, ubi->vid_hdr_aloffset,
 				    ubi->peb_size - ubi->vid_hdr_aloffset);
 	if (err) {