mtd: spi-nor: Potential oops on error path in quad_enable()

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=05d090f00203bdcf722b9cb6d5ac57c165e2c95c
Commit:     05d090f00203bdcf722b9cb6d5ac57c165e2c95c
Parent:     ddd0503e4d780607865950e14f215bf8660ed683
Author:     Dan Carpenter <dan.carpenter at oracle.com>
AuthorDate: Fri May 5 08:33:56 2017 +0300
Committer:  Cyrille Pitchen <cyrille.pitchen at wedev4u.fr>
CommitDate: Mon May 15 21:56:18 2017 +0200

    mtd: spi-nor: Potential oops on error path in quad_enable()
    
    Before commit cff959958832 ("mtd: spi-nor: introduce SPI 1-2-2 and SPI
    1-4-4 protocols") then we treated 1 as -EINVAL in the caller but after
    that commit we changed to propagate the return.  My static checker
    complains that it's eventually passed to an ERR_PTR() and later
    dereferenced, but I'm not totally certain if that's true.  Regardless,
    returning 1 is wrong.
    
    Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
    Signed-off-by: Cyrille Pitchen <cyrille.pitchen at wedev4u.fr>
---
 drivers/mtd/spi-nor/spi-nor.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 060a59e..eef55b5 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1389,8 +1389,9 @@ static int macronix_quad_enable(struct spi_nor *nor)
 
 	write_sr(nor, val | SR_QUAD_EN_MX);
 
-	if (spi_nor_wait_till_ready(nor))
-		return 1;
+	ret = spi_nor_wait_till_ready(nor);
+	if (ret)
+		return ret;
 
 	ret = read_sr(nor);
 	if (!(ret > 0 && (ret & SR_QUAD_EN_MX))) {