forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enic: bug fix: protect fw call i/f with spinlock

Browse source 
Some driver -> nic firmware calls weren't guarded with a spinlock, exposing
the call i/f to a race between two threads

Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Scott Feldman 2009-09-03 17:02:14 +00:00 • committed by David S. Miller
commit 56ac88b38e
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/enic/enic_main.c
View file

@ -1316,6 +1316,7 @@ static int enic_notify_set(struct enic *enic)
{ {
int err; int err;
spin_lock(&enic->devcmd_lock);
switch (vnic_dev_get_intr_mode(enic->vdev)) { switch (vnic_dev_get_intr_mode(enic->vdev)) {
case VNIC_DEV_INTR_MODE_INTX: case VNIC_DEV_INTR_MODE_INTX:
err = vnic_dev_notify_set(enic->vdev, ENIC_INTX_NOTIFY); err = vnic_dev_notify_set(enic->vdev, ENIC_INTX_NOTIFY);
@ -1327,6 +1328,7 @@ static int enic_notify_set(struct enic *enic)
err = vnic_dev_notify_set(enic->vdev, -1 /* no intr */); err = vnic_dev_notify_set(enic->vdev, -1 /* no intr */);
break; break;
} }
spin_unlock(&enic->devcmd_lock);
return err; return err;
} }
@ -1380,12 +1382,16 @@ static int enic_open(struct net_device *netdev)
for (i = 0; i < enic->rq_count; i++) for (i = 0; i < enic->rq_count; i++)
vnic_rq_enable(&enic->rq[i]); vnic_rq_enable(&enic->rq[i]);
spin_lock(&enic->devcmd_lock);
enic_add_station_addr(enic); enic_add_station_addr(enic);
spin_unlock(&enic->devcmd_lock);
enic_set_multicast_list(netdev); enic_set_multicast_list(netdev);
netif_wake_queue(netdev); netif_wake_queue(netdev);
napi_enable(&enic->napi); napi_enable(&enic->napi);
spin_lock(&enic->devcmd_lock);
vnic_dev_enable(enic->vdev); vnic_dev_enable(enic->vdev);
spin_unlock(&enic->devcmd_lock);
for (i = 0; i < enic->intr_count; i++) for (i = 0; i < enic->intr_count; i++)
vnic_intr_unmask(&enic->intr[i]); vnic_intr_unmask(&enic->intr[i]);
@ -1395,7 +1401,9 @@ static int enic_open(struct net_device *netdev)
return 0; return 0;
err_out_notify_unset: err_out_notify_unset:
spin_lock(&enic->devcmd_lock);
vnic_dev_notify_unset(enic->vdev); vnic_dev_notify_unset(enic->vdev);
spin_unlock(&enic->devcmd_lock);
err_out_free_intr: err_out_free_intr:
enic_free_intr(enic); enic_free_intr(enic);
@ -1411,7 +1419,9 @@ static int enic_stop(struct net_device *netdev)
del_timer_sync(&enic->notify_timer); del_timer_sync(&enic->notify_timer);
spin_lock(&enic->devcmd_lock);
vnic_dev_disable(enic->vdev); vnic_dev_disable(enic->vdev);
spin_unlock(&enic->devcmd_lock);
napi_disable(&enic->napi); napi_disable(&enic->napi);
netif_stop_queue(netdev); netif_stop_queue(netdev);
@ -1429,7 +1439,9 @@ static int enic_stop(struct net_device *netdev)
return err; return err;
} }
spin_lock(&enic->devcmd_lock);
vnic_dev_notify_unset(enic->vdev); vnic_dev_notify_unset(enic->vdev);
spin_unlock(&enic->devcmd_lock);
enic_free_intr(enic); enic_free_intr(enic);
(void)vnic_cq_service(&enic->cq[ENIC_CQ_RQ], (void)vnic_cq_service(&enic->cq[ENIC_CQ_RQ],