2010-11-18 18:17:14

by Vasily Kulikov

Subject: [PATCH 4/4] net: caif: spi: fix potential NULL dereference

alloc_netdev() is not checked here for NULL return value. dev is
check instead. It might lead to NULL dereference of ndev.

Signed-off-by: Vasiliy Kulikov <[email protected]>
---
Compile tested.
Maybe dev is also must be checked here, but it looks like a trivial typo.

drivers/net/caif/caif_spi.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
index 8b4cea5..20da199 100644
--- a/drivers/net/caif/caif_spi.c
+++ b/drivers/net/caif/caif_spi.c
@@ -635,8 +635,8 @@ int cfspi_spi_probe(struct platform_device *pdev)

ndev = alloc_netdev(sizeof(struct cfspi),
"cfspi%d", cfspi_setup);
- if (!dev)
- return -ENODEV;
+ if (!ndev)
+ return -ENOMEM;

cfspi = netdev_priv(ndev);
netif_stop_queue(ndev);
--
1.7.0.4

2010-11-18 18:35:55

by David Miller

Subject: Re: [PATCH 4/4] net: caif: spi: fix potential NULL dereference

From: Vasiliy Kulikov <[email protected]>
Date: Thu, 18 Nov 2010 21:17:05 +0300

> alloc_netdev() is not checked here for NULL return value. dev is
> check instead. It might lead to NULL dereference of ndev.
>
> Signed-off-by: Vasiliy Kulikov <[email protected]>
> ---
> Compile tested.
> Maybe dev is also must be checked here, but it looks like a trivial typo.

Definitely looks correct to me, applied, thanks!