[rds-devel] [PATCH] rds: Fix rds message leak in rds_message_map_pages

[Andy Grover]

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 at 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 at oracle.com>

-- Andy