[PATCH] commands: spi: fix NULL pointer dereference

[PATCH] commands: spi: fix NULL pointer dereference

[Steffen Trumtrar]

The renaming of "master" to "controller" done in
    812a9ddcdf211302a050cf8f61f7af577bc29a23
    spi: Generalize SPI "master" to "controller"

breaks the spi command, because the spi.master pointer is not assigned.
The pointer is kept for backwards compatability.

Assign it, so that spi drivers that are still using "spi->master" can be
used.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 commands/spi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/commands/spi.c b/commands/spi.c
index 55a0e255af17..d35aa1cd81c9 100644
--- a/commands/spi.c
+++ b/commands/spi.c
@@ -67,6 +67,7 @@ static int do_spi(int argc, char *argv[])
 		printf("spi bus %d not found\n", bus);
 		return -ENODEV;
 	}
+	spi.master = spi.controller;
 
 	if (spi.chip_select >= spi.controller->num_chipselect) {
 		printf("spi chip select (%d) >= controller num chipselect (%d)\n",
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] commands: spi: fix NULL pointer dereference

[Sascha Hauer]

On Thu, May 16, 2019 at 11:18:39AM +0200, Steffen Trumtrar wrote:
> The renaming of "master" to "controller" done in
>     812a9ddcdf211302a050cf8f61f7af577bc29a23
>     spi: Generalize SPI "master" to "controller"
> 
> breaks the spi command, because the spi.master pointer is not assigned.
> The pointer is kept for backwards compatability.
> 
> Assign it, so that spi drivers that are still using "spi->master" can be
> used.
> 
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  commands/spi.c | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox