[PATCH] mtd: nftl: Remove VLA usage

[Kees Cook]

On the quest to remove all VLAs from the kernel[1] this changes the
check_free_sectors() routine to use the same stack buffer for both
data byte checks (SECTORSIZE) and oob byte checks (oobsize). Since
these regions aren't needed at the same time, they don't need to be
consecutively allocated. Additionally, while it's possible for oobsize
to be large, it is unlikely to be larger than the actual SECTORSIZE. As
such, remove the VLA, adjust offsets and add a sanity check to make sure
we never get a pathological oobsize.

[1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com

Signed-off-by: Kees Cook <keescook at chromium.org>
---
 drivers/mtd/inftlmount.c | 11 ++++++++---
 drivers/mtd/nftlmount.c  | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index aab4f68bd36f..9cdae7f0fc2e 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -334,7 +334,7 @@ static int memcmpb(void *a, int c, int n)
 static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,
 	int len, int check_oob)
 {
-	u8 buf[SECTORSIZE + inftl->mbd.mtd->oobsize];
+	u8 buf[SECTORSIZE];
 	struct mtd_info *mtd = inftl->mbd.mtd;
 	size_t retlen;
 	int i;
@@ -346,10 +346,15 @@ static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,
 			return -1;
 
 		if (check_oob) {
+			if (mtd->oobsize > sizeof(buf)) {
+				pr_warn("MTD oobsize > SECTORSIZE: %d\n",
+					mtd->oobsize);
+				return -1;
+			}
 			if(inftl_read_oob(mtd, address, mtd->oobsize,
-					  &retlen, &buf[SECTORSIZE]) < 0)
+					  &retlen, buf) < 0)
 				return -1;
-			if (memcmpb(buf + SECTORSIZE, 0xff, mtd->oobsize) != 0)
+			if (memcmpb(buf, 0xff, mtd->oobsize) != 0)
 				return -1;
 		}
 		address += SECTORSIZE;
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index a6fbfa4e5799..e6eba7f3fdf5 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -272,7 +272,7 @@ static int memcmpb(void *a, int c, int n)
 static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int len,
 			      int check_oob)
 {
-	u8 buf[SECTORSIZE + nftl->mbd.mtd->oobsize];
+	u8 buf[SECTORSIZE];
 	struct mtd_info *mtd = nftl->mbd.mtd;
 	size_t retlen;
 	int i;
@@ -284,10 +284,15 @@ static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int
 			return -1;
 
 		if (check_oob) {
+			if (mtd->oobsize > sizeof(buf)) {
+				pr_warn("MTD oobsize > SECTORSIZE: %d\n",
+					mtd->oobsize);
+				return -1;
+			}
 			if(nftl_read_oob(mtd, address, mtd->oobsize,
-					 &retlen, &buf[SECTORSIZE]) < 0)
+					 &retlen, buf) < 0)
 				return -1;
-			if (memcmpb(buf + SECTORSIZE, 0xff, mtd->oobsize) != 0)
+			if (memcmpb(buf, 0xff, mtd->oobsize) != 0)
 				return -1;
 		}
 		address += SECTORSIZE;
-- 
2.7.4


-- 
Kees Cook
Pixel Security