openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Javier Martinez Canillas 2015-10-30 13:49:17 +01:00 committed by David S. Miller
parent 322cf7e3a4
commit d0cb48cd19
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/microchip/encx24j600.c
View File

@ -1094,8 +1094,9 @@ static int encx24j600_spi_remove(struct spi_device *spi)
return 0; return 0;
} }
static const struct spi_device_id encx24j600_spi_id_table = { static const struct spi_device_id encx24j600_spi_id_table[] = {
.name = "encx24j600" { .name = "encx24j600" },
{ /* sentinel */ }
}; };
static struct spi_driver encx24j600_spi_net_driver = { static struct spi_driver encx24j600_spi_net_driver = {
@ -1106,7 +1107,7 @@ static struct spi_driver encx24j600_spi_net_driver = {
}, },
.probe = encx24j600_spi_probe, .probe = encx24j600_spi_probe,
.remove = encx24j600_spi_remove, .remove = encx24j600_spi_remove,
.id_table = &encx24j600_spi_id_table, .id_table = encx24j600_spi_id_table,
}; };
static int __init encx24j600_init(void) static int __init encx24j600_init(void)