[U-Boot] [PATCH 1/1] atcspi200: avoid possible NULL dereference

Heinrich Schuchardt xypron.glpk at gmx.de
Wed Jan 31 00:05:54 UTC 2018


Check if ns before and not after dereferencing it.

Indicated by cppcheck.

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 drivers/spi/atcspi200_spi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 3e29df03a4..5b2e9d6264 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -297,6 +297,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 		return NULL;
 
 	ns = spi_alloc_slave(struct nds_spi_slave, bus, cs);
+	if (!ns)
+		return NULL;
 
 	switch (bus) {
 	case SPI0_BUS:
@@ -316,8 +318,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 	ns->to = SPI_TIMEOUT;
 	ns->max_transfer_length = MAX_TRANSFER_LEN;
 	ns->slave.max_write_size = MAX_TRANSFER_LEN;
-	if (!ns)
-		return NULL;
 
 	return &ns->slave;
 }
-- 
2.15.1



More information about the U-Boot mailing list