Commit d0cb48cd authored Oct 30, 2015 by Javier Martinez Canillas Committed by David S. Miller Nov 02, 2015

net: encx24j600: Fix SPI id table definition



A driver's SPI id table is expected to be an array of struct spi_device_id
that ends with a zero-initialized sentinel entry. But this driver defines
the table as a single struct spi_device_id and sets .id_table to a pointer
to this struct.

But spi_match_id() has a loop that iterates while the struct spi_device_id
.name[0] is not NULL, so not having a sentinel can cause a NULL pointer
deference error.

This patch defines the SPI id table correctly as all other SPI drivers do.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 322cf7e3

drivers/net/ethernet/microchip/encx24j600.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1094,8 +1094,9 @@ static int encx24j600_spi_remove(struct spi_device *spi)
		return 0;
		}

		static const struct spi_device_id encx24j600_spi_id_table = {
		.name = "encx24j600"
		static const struct spi_device_id encx24j600_spi_id_table[] = {
		{ .name = "encx24j600" },
		{ /* sentinel */ }
		};

		static struct spi_driver encx24j600_spi_net_driver = {
		@@ -1106,7 +1107,7 @@ static struct spi_driver encx24j600_spi_net_driver = {
		},
		.probe = encx24j600_spi_probe,
		.remove = encx24j600_spi_remove,
		.id_table = &encx24j600_spi_id_table,
		.id_table = encx24j600_spi_id_table,
		};

		static int __init encx24j600_init(void)