2010-04-26 22:34:53

by Peter Huewe

Subject: [PATCH] staging/otus: Add null check and fix coding style issue

From: Peter Huewe <[email protected]>

This patch removes mixing of declarations and code and adds a null-test
after a kmalloc.

Patch against linux-next as of 20100427

Signed-off-by: Peter Huewe <[email protected]>
---
drivers/staging/otus/ioctl.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
index 84be4b2..cface46 100644
--- a/drivers/staging/otus/ioctl.c
+++ b/drivers/staging/otus/ioctl.c
@@ -867,6 +867,7 @@ int usbdrvwext_giwscan(struct net_device *dev,
char *current_ev = extra;
char *end_buf;
int i;
+ struct zsBssListV1 *pBssList;
/* BssList = wd->sta.pBssList; */
/* zmw_get_wlan_dev(dev); */

@@ -874,8 +875,10 @@ int usbdrvwext_giwscan(struct net_device *dev,
return 0;

/* struct zsBssList BssList; */
- struct zsBssListV1 *pBssList = kmalloc(sizeof(struct zsBssListV1),
- GFP_KERNEL);
+ pBssList = kmalloc(sizeof(struct zsBssListV1), GFP_KERNEL);
+ if (pBssList == NULL)
+ return -ENOMEM;
+
if (data->length == 0)
end_buf = extra + IW_SCAN_MAX_DATA;
else
--
1.6.4.4

2010-04-27 08:16:25

by Simon Horman

Subject: Re: [PATCH] staging/otus: Add null check and fix coding style issue

On Tue, Apr 27, 2010 at 12:34:49AM +0200, Peter Huewe wrote:
> From: Peter Huewe <[email protected]>
>
> This patch removes mixing of declarations and code and adds a null-test
> after a kmalloc.
>
> Patch against linux-next as of 20100427
>
> Signed-off-by: Peter Huewe <[email protected]>
Acked-by: Simon Horman <[email protected]>

> ---
> drivers/staging/otus/ioctl.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
> index 84be4b2..cface46 100644
> --- a/drivers/staging/otus/ioctl.c
> +++ b/drivers/staging/otus/ioctl.c
> @@ -867,6 +867,7 @@ int usbdrvwext_giwscan(struct net_device *dev,
> char *current_ev = extra;
> char *end_buf;
> int i;
> + struct zsBssListV1 *pBssList;
> /* BssList = wd->sta.pBssList; */
> /* zmw_get_wlan_dev(dev); */
>
> @@ -874,8 +875,10 @@ int usbdrvwext_giwscan(struct net_device *dev,
> return 0;
>
> /* struct zsBssList BssList; */
> - struct zsBssListV1 *pBssList = kmalloc(sizeof(struct zsBssListV1),
> - GFP_KERNEL);
> + pBssList = kmalloc(sizeof(struct zsBssListV1), GFP_KERNEL);
> + if (pBssList == NULL)
> + return -ENOMEM;
> +
> if (data->length == 0)
> end_buf = extra + IW_SCAN_MAX_DATA;
> else
> --
> 1.6.4.4