netdev - Re: [PATCH] gianfar: Fix a memory leak in gianfar close code

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 30 Mar 2010 09:50:49 -0700
From:	Laurent Chavey <chavey@...gle.com>
To:	Andy Fleming <afleming@...escale.com>
Cc:	davem@...emloft.net, netdev@...r.kernel.org,
	eric.dumazet@...il.com, Sandeep.Kumar@...escale.com
Subject: Re: [PATCH] gianfar: Fix a memory leak in gianfar close code

since free_skb_[rx | tx]_queue() expects rx_queue->rx_skbuff to not be NULL
what about moving the conditional if(rx_queue->rx_skbuff)
in free_skb_rx_queue() and  if(tx_queue->tx_skbuff) in free_skb_tx_queue()
OR put an assertion for not NULL in those functions ?



On Mon, Mar 29, 2010 at 6:42 PM, Andy Fleming <afleming@...escale.com> wrote:
> gianfar needed to ensure existence of the *skbuff arrays before
> freeing the skbs in them, rather than ensuring their nonexistence.
>
> Signed-off-by: Andy Fleming <afleming@...escale.com>
> ---
>  drivers/net/gianfar.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
> index b671555..ad59608 100644
> --- a/drivers/net/gianfar.c
> +++ b/drivers/net/gianfar.c
> @@ -1638,13 +1638,13 @@ static void free_skb_resources(struct gfar_private *priv)
>        /* Go through all the buffer descriptors and free their data buffers */
>        for (i = 0; i < priv->num_tx_queues; i++) {
>                tx_queue = priv->tx_queue[i];
> -               if(!tx_queue->tx_skbuff)
> +               if(tx_queue->tx_skbuff)
>                        free_skb_tx_queue(tx_queue);
>        }
>
>        for (i = 0; i < priv->num_rx_queues; i++) {
>                rx_queue = priv->rx_queue[i];
> -               if(!rx_queue->rx_skbuff)
> +               if(rx_queue->rx_skbuff)
>                        free_skb_rx_queue(rx_queue);
>        }
>
> --
> 1.6.5.2.g6ff9a
>
> --
> 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
>
--
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