From 7d05652c5ce812b4d1addd1a2733d20c912d528d Mon Sep 17 00:00:00 2001 From: Chandra S Gorentla Date: Tue, 15 Sep 2015 18:09:51 +0530 Subject: [PATCH] drivers: staging: wilc1000: Add check for SPI availability NULL pointer deference is observed in the wilc1000.ko module with bus type SPI and when SPI is not ready. Signed-off-by: Chandra S Gorentla Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/linux_wlan.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index d8f17c6f9b5f..9436eace44fa 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1634,6 +1634,12 @@ int mac_open(struct net_device *ndev) int i = 0; struct WILC_WFI_priv *priv; +#ifdef WILC_SPI + if (!g_linux_wlan || !g_linux_wlan->wilc_spidev) { + netdev_err(ndev, "wilc1000: SPI device not ready\n"); + return -ENODEV; + } +#endif nic = netdev_priv(ndev); priv = wiphy_priv(nic->wilc_netdev->ieee80211_ptr->wiphy); PRINT_D(INIT_DBG, "MAC OPEN[%p]\n", ndev); -- 2.39.5