lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 13 Apr 2012 10:24:13 -0700 From: Stephen Hemminger <shemminger@...tta.com> To: David Miller <davem@...emloft.net> Cc: LinoSanfilippo@....de, mlindner@...vell.com, netdev@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: sky2: in free_buffers() do proper checks before call of rx_clean() How about this instead? It moves the rx_clean out of free_buffers and into the proper place in the unwind code. --- a/drivers/net/ethernet/marvell/sky2.c 2012-04-12 08:07:11.572640522 -0700 +++ b/drivers/net/ethernet/marvell/sky2.c 2012-04-13 10:19:39.466839378 -0700 @@ -1630,7 +1630,8 @@ static int sky2_alloc_buffers(struct sky if (!sky2->rx_ring) goto nomem; - return sky2_alloc_rx_skbs(sky2); + return 0; + nomem: return -ENOMEM; } @@ -1639,8 +1640,6 @@ static void sky2_free_buffers(struct sky { struct sky2_hw *hw = sky2->hw; - sky2_rx_clean(sky2); - if (sky2->rx_le) { pci_free_consistent(hw->pdev, RX_LE_BYTES, sky2->rx_le, sky2->rx_le_map); @@ -1761,9 +1760,13 @@ static int sky2_open(struct net_device * if (err) goto err_out; + err = sky2_alloc_rx_skbs(sky2); + if (err) + goto err_clean; + /* With single port, IRQ is setup when device is brought up */ if (hw->ports == 1 && (err = sky2_setup_irq(hw, dev->name))) - goto err_out; + goto err_clean; sky2_hw_up(sky2); @@ -1783,6 +1786,8 @@ static int sky2_open(struct net_device * return 0; +err_clean: + sky2_rx_clean(sky2); err_out: sky2_free_buffers(sky2); return err; @@ -2158,6 +2163,7 @@ static int sky2_close(struct net_device sky2_hw_down(sky2); + sky2_rx_clean(sky2); sky2_free_buffers(sky2); return 0; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists