On Wed, 2013-10-30 at 20:12 +0300, Dan Carpenter wrote:
> If we do a zero size allocation then it will oops.  Also we can't be
> sure the user passes us a NUL terminated string so I've added a
> terminator.
> 
> This code can only be triggered by root.
> 
> Reported-by: Nico Golde <[email protected]>
> Reported-by: Fabian Yamaguchi <[email protected]>
> Signed-off-by: Dan Carpenter <[email protected]>

Acked-by: Dan Williams <[email protected]>

> 
> diff --git a/drivers/net/wireless/libertas/debugfs.c 
> b/drivers/net/wireless/libertas/debugfs.c
> index 668dd27..1917348 100644
> --- a/drivers/net/wireless/libertas/debugfs.c
> +++ b/drivers/net/wireless/libertas/debugfs.c
> @@ -913,7 +913,10 @@ static ssize_t lbs_debugfs_write(struct file *f, const 
> char __user *buf,
>       char *p2;
>       struct debug_data *d = f->private_data;
>  
> -     pdata = kmalloc(cnt, GFP_KERNEL);
> +     if (cnt == 0)
> +             return 0;
> +
> +     pdata = kmalloc(cnt + 1, GFP_KERNEL);
>       if (pdata == NULL)
>               return 0;
>  
> @@ -922,6 +925,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const 
> char __user *buf,
>               kfree(pdata);
>               return 0;
>       }
> +     pdata[cnt] = '\0';
>  
>       p0 = pdata;
>       for (i = 0; i < num_of_items; i++) {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to