[PATCH v2] mtd: don't try to detect UBI in too small flash partitions

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

The detect callback will try to detect an UBI volume inside a partition.

This can misbehave for partitions without UBI:

  - For partitions smaller than 512 bytes, detect fails with -EINVAL,
    because it wasn't possible to read as much

  - For partitions smaller than 64 PEBs, detect will erroneously do
    64 lookups and attempt reading beyond the partition

  - For partition bigger than 64 PEBs, but without UBI, detect will
    read 512 bytes off each PEB without ever finding the UBI.

Fix this by not attempting to read more PEBs than they are and ensure
that there at least 5 PEBs, because anything lower wouldn't account for
UBI overhead[1].

[1]: http://www.linux-mtd.infradead.org/doc/ubi.html#L_overhead

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
  - change minimum PEB count to 5 instead of 1 (Sascha)
  - change erroneous max() to min() (Sascha)
  - reword commit message to avoid confusion around 512 byte read
    (Sascha)

---
 drivers/mtd/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index 97a7996cf68e..ec2c3ff7bb41 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -599,7 +599,10 @@ static int mtd_detect(struct device *dev)
 	enum filetype filetype;
 	int npebs = mtd_div_by_eb(mtd->size, mtd);
 
-	npebs = max(npebs, 64);
+	/* No point in looking for UBI on a partition that's too small */
+	npebs = min(npebs, 64);
+	if (npebs < 5)
+		return 0;
 
 	/*
 	 * Do not try to attach an UBI device if this device has partitions
-- 
2.39.2