On Wed, Nov 27, 2019 at 12:55:27AM +0700, Phong Tran wrote: > correct usage prototype of callback in tasklet_init(). > Report by https://github.com/KSPP/linux/issues/20 > > Signed-off-by: Phong Tran <tranmanphong@xxxxxxxxx> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> -Kees > --- > drivers/net/wireless/intel/ipw2x00/ipw2100.c | 7 ++++--- > drivers/net/wireless/intel/ipw2x00/ipw2200.c | 5 +++-- > 2 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c > index 8dfbaff2d1fe..a162146a43a7 100644 > --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c > +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c > @@ -3206,8 +3206,9 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) > } > } > > -static void ipw2100_irq_tasklet(struct ipw2100_priv *priv) > +static void ipw2100_irq_tasklet(unsigned long data) > { > + struct ipw2100_priv *priv = (struct ipw2100_priv *)data; > struct net_device *dev = priv->net_dev; > unsigned long flags; > u32 inta, tmp; > @@ -6007,7 +6008,7 @@ static void ipw2100_rf_kill(struct work_struct *work) > spin_unlock_irqrestore(&priv->low_lock, flags); > } > > -static void ipw2100_irq_tasklet(struct ipw2100_priv *priv); > +static void ipw2100_irq_tasklet(unsigned long data); > > static const struct net_device_ops ipw2100_netdev_ops = { > .ndo_open = ipw2100_open, > @@ -6137,7 +6138,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev, > INIT_DELAYED_WORK(&priv->rf_kill, ipw2100_rf_kill); > INIT_DELAYED_WORK(&priv->scan_event, ipw2100_scan_event); > > - tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long)) > + tasklet_init(&priv->irq_tasklet, > ipw2100_irq_tasklet, (unsigned long)priv); > > /* NOTE: We do not start the deferred work for status checks yet */ > diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c > index ed0f06532d5e..ac5f797fb1ad 100644 > --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c > +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c > @@ -1945,8 +1945,9 @@ static void notify_wx_assoc_event(struct ipw_priv *priv) > wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL); > } > > -static void ipw_irq_tasklet(struct ipw_priv *priv) > +static void ipw_irq_tasklet(unsigned long data) > { > + struct ipw_priv *priv = (struct ipw_priv *)data; > u32 inta, inta_mask, handled = 0; > unsigned long flags; > int rc = 0; > @@ -10680,7 +10681,7 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv) > INIT_WORK(&priv->qos_activate, ipw_bg_qos_activate); > #endif /* CONFIG_IPW2200_QOS */ > > - tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long)) > + tasklet_init(&priv->irq_tasklet, > ipw_irq_tasklet, (unsigned long)priv); > > return ret; > -- > 2.20.1 > -- Kees Cook
