Commit 05d090f0 authored May 05, 2017 by Dan Carpenter Committed by Cyrille Pitchen May 15, 2017

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@oracle.com>
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>

parent ddd0503e

drivers/mtd/spi-nor/spi-nor.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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))) {

Admin message