netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Grover <andy.grover@oracle.com>
To: Pavel Emelyanov <xemul@parallels.com>
Cc: David Miller <davem@davemloft.net>,
	rds-devel@oss.oracle.com,
	Linux Netdev List <netdev@vger.kernel.org>
Subject: Re: [PATCH] rds: Fix rds message leak in rds_message_map_pages
Date: Mon, 08 Nov 2010 11:40:53 -0800	[thread overview]
Message-ID: <4CD85245.9090409@oracle.com> (raw)
In-Reply-To: <4CD82362.9070402@parallels.com>

On 11/08/2010 08:20 AM, Pavel Emelyanov wrote:
> The sgs allocation error path leaks the allocated message.
>
> Signed-off-by: Pavel Emelyanov<xemul@openvz.org>
>
> ---
>
> diff --git a/net/rds/message.c b/net/rds/message.c
> index 848cff4..1fd3d29 100644
> --- a/net/rds/message.c
> +++ b/net/rds/message.c
> @@ -249,8 +249,10 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in
>   	rm->m_inc.i_hdr.h_len = cpu_to_be32(total_len);
>   	rm->data.op_nents = ceil(total_len, PAGE_SIZE);
>   	rm->data.op_sg = rds_message_alloc_sgs(rm, num_sgs);
> -	if (!rm->data.op_sg)
> +	if (!rm->data.op_sg) {
> +		rds_message_put(rm);
>   		return ERR_PTR(-ENOMEM);
> +	}
>
>   	for (i = 0; i<  rm->data.op_nents; ++i) {
>   		sg_set_page(&rm->data.op_sg[i],

Acked-by: Andy Grover <andy.grover@oracle.com>

-- Andy

  reply	other threads:[~2010-11-08 19:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-08 16:20 [PATCH] rds: Fix rds message leak in rds_message_map_pages Pavel Emelyanov
2010-11-08 19:40 ` Andy Grover [this message]
2010-11-08 20:20   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4CD85245.9090409@oracle.com \
    --to=andy.grover@oracle.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=rds-devel@oss.oracle.com \
    --cc=xemul@parallels.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).