[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <6da1421318f8a48b7d8b44f2c6b7ebe6818e0de5.1446021555.git.jslaby@suse.cz>
Date:	Wed, 28 Oct 2015 14:53:03 +0100
From:	Jiri Slaby <jslaby@...e.cz>
To:	stable@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, Richard Weinberger <richard@....at>,
	Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 072/123] UBI: Validate data_size
From: Richard Weinberger <richard@....at>
3.12-stable review patch.  If anyone has any objections, please let me know.
===============
commit 281fda27673f833a01d516658a64d22a32c8e072 upstream.
Make sure that data_size is less than LEB size.
Otherwise a handcrafted UBI image is able to trigger
an out of bounds memory access in ubi_compare_lebs().
Signed-off-by: Richard Weinberger <richard@....at>
Reviewed-by: David Gstir <david@...ma-star.at>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
 drivers/mtd/ubi/io.c | 5 +++++
 1 file changed, 5 insertions(+)
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index bf79def40126..8822e880833b 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -931,6 +931,11 @@ static int validate_vid_hdr(const struct ubi_device *ubi,
 		goto bad;
 	}
 
+	if (data_size > ubi->leb_size) {
+		ubi_err("bad data_size");
+		goto bad;
+	}
+
 	if (vol_type == UBI_VID_STATIC) {
 		/*
 		 * Although from high-level point of view static volumes may
-- 
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Powered by blists - more mailing lists
 
