[patch] staging: wilc1000: NULL dereference on error

[patch] staging: wilc1000: NULL dereference on error

[Dan Carpenter]

We can't pass NULL pointers to destroy_workqueue().

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 0b1760c..78f524f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3363,7 +3363,7 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
 		if (!hif_workqueue) {
 			netdev_err(vif->ndev, "Failed to create workqueue\n");
 			result = -ENOMEM;
-			goto _fail_mq_;
+			goto _fail_;
 		}
 
 		setup_timer(&periodic_rssi, GetPeriodicRSSI,
@@ -3391,7 +3391,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
 
 	clients_count++;
 
-_fail_mq_:
 	destroy_workqueue(hif_workqueue);
 _fail_:
 	return result;

Re: [patch] staging: wilc1000: NULL dereference on error

[walter harms]

Am 16.07.2016 12:07, schrieb Dan Carpenter:
> We can't pass NULL pointers to destroy_workqueue().
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
> index 0b1760c..78f524f 100644
> --- a/drivers/staging/wilc1000/host_interface.c
> +++ b/drivers/staging/wilc1000/host_interface.c
> @@ -3363,7 +3363,7 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
>  		if (!hif_workqueue) {
>  			netdev_err(vif->ndev, "Failed to create workqueue\n");
>  			result = -ENOMEM;
> -			goto _fail_mq_;
> +			goto _fail_;
>  		}
>  


maybe this is the point where return -ENOMEM; is the most simple solution ?

re,
 wh


>  		setup_timer(&periodic_rssi, GetPeriodicRSSI,
> @@ -3391,7 +3391,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
>  
>  	clients_count++;
>  
> -_fail_mq_:
>  	destroy_workqueue(hif_workqueue);
>  _fail_:
>  	return result;
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [patch] staging: wilc1000: NULL dereference on error

[Dan Carpenter]

On Sat, Jul 16, 2016 at 12:19:03PM +0200, walter harms wrote:
> 
> 
> Am 16.07.2016 12:07, schrieb Dan Carpenter:
> > We can't pass NULL pointers to destroy_workqueue().
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > 
> > diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
> > index 0b1760c..78f524f 100644
> > --- a/drivers/staging/wilc1000/host_interface.c
> > +++ b/drivers/staging/wilc1000/host_interface.c
> > @@ -3363,7 +3363,7 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
> >  		if (!hif_workqueue) {
> >  			netdev_err(vif->ndev, "Failed to create workqueue\n");
> >  			result = -ENOMEM;
> > -			goto _fail_mq_;
> > +			goto _fail_;
> >  		}
> >  
> 
> 
> maybe this is the point where return -ENOMEM; is the most simple solution ?

Yeah.  This code is staging quality.  There are lots of other cleanups
someone could do.  Later patches...

regards,
dan carpenter