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
| ||
|
Message-ID: <20120629213755.GC19152@electric-eye.fr.zoreil.com> Date: Fri, 29 Jun 2012 23:37:55 +0200 From: Francois Romieu <romieu@...zoreil.com> To: Jitendra Kalsaria <jitendra.kalsaria@...gic.com> Cc: davem@...emloft.net, netdev@...r.kernel.org, Ron@...ux-zupk.site, Dept_NX_Linux_NIC_Driver@...gic.com Subject: Re: [PATCH net-next 4/6] qlge: Fixed double pci free upon tx_ring->q allocation failure. Jitendra Kalsaria <jitendra.kalsaria@...gic.com> : [...] > diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c > index cdbc860..aa514c5 100644 > --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c > +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c > @@ -2701,11 +2701,9 @@ static int ql_alloc_tx_resources(struct ql_adapter *qdev, > pci_alloc_consistent(qdev->pdev, tx_ring->wq_size, > &tx_ring->wq_base_dma); > > - if ((tx_ring->wq_base == NULL) || > - tx_ring->wq_base_dma & WQ_ADDR_ALIGN) { > - netif_err(qdev, ifup, qdev->ndev, "tx_ring alloc failed.\n"); > - return -ENOMEM; > - } > + if ((tx_ring->wq_base == NULL) || tx_ring->wq_base_dma & WQ_ADDR_ALIGN) > + goto err; > + > tx_ring->q = > kmalloc(tx_ring->wq_len * sizeof(struct tx_ring_desc), GFP_KERNEL); > if (tx_ring->q == NULL) > @@ -2713,8 +2711,12 @@ static int ql_alloc_tx_resources(struct ql_adapter *qdev, > > return 0; > err: > - pci_free_consistent(qdev->pdev, tx_ring->wq_size, > + if (tx_ring->wq_base) { > + pci_free_consistent(qdev->pdev, tx_ring->wq_size, > tx_ring->wq_base, tx_ring->wq_base_dma); > + tx_ring->wq_base = NULL; > + } You do not need a test: use a second label + goto. Nit: You can replace 'if ((tx_ring->wq_base == NULL)' with 'if (!tx_ring->wq_base' and add a local variable for qdev->pdev. You may consider replacing pci_alloc_consistent with dma_alloc_coherent in a future patch. -- Ueimor -- 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