[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1337009597.17437.1.camel@marge.simpson.net>
Date: Mon, 14 May 2012 17:33:17 +0200
From: Mike Galbraith <mgalbraith@...e.de>
To: Thadeu Lima de Souza Cascardo <cascardo@...ux.vnet.ibm.com>
Cc: netdev <netdev@...r.kernel.org>,
Jitendra Kalsaria <jitendra.kalsaria@...gic.com>
Subject: Re: [patch] Re: qlge driver corrupting kernel memory
(add CC)
On Sun, 2012-05-13 at 12:16 +0200, Mike Galbraith wrote:
> Erm, with a quilt refresh you get the compiling version :)
>
> glge: Fix double pci_free_consistent() upon tx_ring->q allocation failure
>
> Let ql_free_tx_resources() do it's job. You are not helping.
>
> Signed-off-by: Mike Galbraith <mgalbraith@...e.de>
> ---
> drivers/net/qlge/qlge_main.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> --- a/drivers/net/qlge/qlge_main.c
> +++ b/drivers/net/qlge/qlge_main.c
> @@ -2664,11 +2664,8 @@ static int ql_alloc_tx_resources(struct
> 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) {
> - QPRINTK(qdev, IFUP, ERR, "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)
> @@ -2676,8 +2673,7 @@ static int ql_alloc_tx_resources(struct
>
> return 0;
> err:
> - pci_free_consistent(qdev->pdev, tx_ring->wq_size,
> - tx_ring->wq_base, tx_ring->wq_base_dma);
> + QPRINTK(qdev, IFUP, ERR, "tx_ring alloc failed.\n");
> return -ENOMEM;
> }
>
>
>
--
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