netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Fastabend <john.fastabend@gmail.com>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: Re: [Patch net-next v2] net_sched: fix memory leak in cls_tcindex
Date: Mon, 15 Sep 2014 17:11:48 -0700	[thread overview]
Message-ID: <54178044.1010407@gmail.com> (raw)
In-Reply-To: <1410824623-27516-1-git-send-email-xiyou.wangcong@gmail.com>

On 09/15/2014 04:43 PM, Cong Wang wrote:
> Fixes: commit 331b72922c5f58d48fd ("net: sched: RCU cls_tcindex")
> Cc: John Fastabend <john.fastabend@gmail.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> ---
>
> v2: fix err = -ENOMEM
>
>   net/sched/cls_tcindex.c | 17 ++++++++++-------
>   1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
> index dd2d691..ee52542 100644
> --- a/net/sched/cls_tcindex.c
> +++ b/net/sched/cls_tcindex.c
> @@ -242,8 +242,10 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
>   	 * perfect hash and hash pointers from old data.
>   	 */
>   	cp = kzalloc(sizeof(*cp), GFP_KERNEL);
> -	if (!cp)
> -		return -ENOMEM;
> +	if (!cp) {
> +		err = -ENOMEM;
> +		goto errout;
> +	}

Thanks for fixing up tcindex for me I see now it was missing
from my test scripts. Along with cls_bpf so I'll need to go
back and test that as well.

Acked-By: John Fastabend <john.r.fastabend@gmail.com>


-- 
John Fastabend         Intel Corporation

  parent reply	other threads:[~2014-09-16  0:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-15 23:43 [Patch net-next v2] net_sched: fix memory leak in cls_tcindex Cong Wang
2014-09-15 23:43 ` [Patch net-next] net_sched: fix a null pointer dereference in tcindex_set_parms() Cong Wang
2014-09-16  0:15   ` John Fastabend
2014-09-16 19:20   ` David Miller
2014-09-16  0:11 ` John Fastabend [this message]
2014-09-16 19:19 ` [Patch net-next v2] net_sched: fix memory leak in cls_tcindex 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=54178044.1010407@gmail.com \
    --to=john.fastabend@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=xiyou.wangcong@gmail.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).