diff options
| author | Stanislaw Gruszka <stf_xl@wp.pl> | 2014-01-25 14:34:54 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-28 04:39:53 +0400 |
| commit | 731073b9c99d46c6b6c01184f67ee6f75fd7a163 (patch) | |
| tree | a184be898fb6131a9489d1956940d28663e6d36b /drivers/net/ethernet/marvell | |
| parent | a452ce345d63ddf92cd101e4196569f8718ad319 (diff) | |
| download | linux-731073b9c99d46c6b6c01184f67ee6f75fd7a163.tar.xz | |
sky2: initialize napi before registering device
There is race condition when call netif_napi_add() after
register_netdevice(), as ->open() can be called without napi initialized
and trigger BUG_ON() on napi_enable(), like on below messages:
[ 9.699863] sky2: driver version 1.30
[ 9.699960] sky2 0000:02:00.0: Yukon-2 EC Ultra chip revision 2
[ 9.700020] sky2 0000:02:00.0: irq 45 for MSI/MSI-X
[ 9.700498] ------------[ cut here ]------------
[ 9.703391] kernel BUG at include/linux/netdevice.h:501!
[ 9.703391] invalid opcode: 0000 [#1] PREEMPT SMP
<snip>
[ 9.830018] Call Trace:
[ 9.830018] [<fa996169>] sky2_open+0x309/0x360 [sky2]
[ 9.830018] [<c1007210>] ? via_no_dac+0x40/0x40
[ 9.830018] [<c1007210>] ? via_no_dac+0x40/0x40
[ 9.830018] [<c135ed4b>] __dev_open+0x9b/0x120
[ 9.830018] [<c1431cbe>] ? _raw_spin_unlock_bh+0x1e/0x20
[ 9.830018] [<c135efd9>] __dev_change_flags+0x89/0x150
[ 9.830018] [<c135f148>] dev_change_flags+0x18/0x50
[ 9.830018] [<c13bb8e0>] devinet_ioctl+0x5d0/0x6e0
[ 9.830018] [<c13bcced>] inet_ioctl+0x6d/0xa0
To fix the problem patch changes the order of initialization.
Bug report:
https://bugzilla.kernel.org/show_bug.cgi?id=67151
Reported-and-tested-by: ebrahim.azarisooreh@gmail.com
Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 6509935d145e..55a37ae11440 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -5020,6 +5020,8 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } } + netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT); + err = register_netdev(dev); if (err) { dev_err(&pdev->dev, "cannot register net device\n"); @@ -5028,8 +5030,6 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netif_carrier_off(dev); - netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT); - sky2_show_addr(dev); if (hw->ports > 1) { |