From 65bac45479638196e9fbb1991429cfa1e63b2783 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Sun, 16 Jan 2011 17:50:54 +0200
Subject: [PATCH] --- yaml --- r: 231721 b: refs/heads/master c:
 154bf89f5e3e3dc59666926f27ca4a0866f39157 h: refs/heads/master i:   231719:
 1ff8d0cbc3b0b4be1913dc5fca236ced16e5099f v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/mtd/mtdpart.c | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd2bae94be60..e85947005ce3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52d039fdaa78c5a9f9bc2940ad58d7ed76b8336d
+refs/heads/master: 154bf89f5e3e3dc59666926f27ca4a0866f39157
diff --git a/trunk/drivers/mtd/mtdpart.c b/trunk/drivers/mtd/mtdpart.c
index b910a37baed8..0a4760174782 100644
--- a/trunk/drivers/mtd/mtdpart.c
+++ b/trunk/drivers/mtd/mtdpart.c
@@ -120,8 +120,25 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from,
 		return -EINVAL;
 	if (ops->datbuf && from + ops->len > mtd->size)
 		return -EINVAL;
-	res = part->master->read_oob(part->master, from + part->offset, ops);
 
+	/*
+	 * If OOB is also requested, make sure that we do not read past the end
+	 * of this partition.
+	 */
+	if (ops->oobbuf) {
+		size_t len, pages;
+
+		if (ops->mode == MTD_OOB_AUTO)
+			len = mtd->oobavail;
+		else
+			len = mtd->oobsize;
+		pages = mtd_div_by_ws(mtd->size, mtd);
+		pages -= mtd_div_by_ws(from, mtd);
+		if (ops->ooboffs + ops->ooblen > pages * len)
+			return -EINVAL;
+	}
+
+	res = part->master->read_oob(part->master, from + part->offset, ops);
 	if (unlikely(res)) {
 		if (res == -EUCLEAN)
 			mtd->ecc_stats.corrected++;