All of lore.kernel.org
 help / color / mirror / Atom feed
* Patch "act_ipt: fix a bind refcnt leak" has been added to the 4.6-stable tree
@ 2016-07-06 23:56 gregkh
  0 siblings, 0 replies; only message in thread
From: gregkh @ 2016-07-06 23:56 UTC (permalink / raw)
  To: xiyou.wangcong, davem, gregkh, jhs; +Cc: stable, stable-commits


This is a note to let you know that I've just added the patch titled

    act_ipt: fix a bind refcnt leak

to the 4.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     act_ipt-fix-a-bind-refcnt-leak.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Wed Jul  6 16:50:56 PDT 2016
From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Mon, 13 Jun 2016 13:44:14 -0700
Subject: act_ipt: fix a bind refcnt leak

From: WANG Cong <xiyou.wangcong@gmail.com>

[ Upstream commit d15eccea69b96a5116169688dcc9baf6d1ce2751 ]

And avoid calling tcf_hash_check() twice.

Fixes: a57f19d30b2d ("net sched: ipt action fix late binding")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/sched/act_ipt.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -121,10 +121,13 @@ static int __tcf_ipt_init(struct tc_acti
 	}
 
 	td = (struct xt_entry_target *)nla_data(tb[TCA_IPT_TARG]);
-	if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size)
+	if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size) {
+		if (exists)
+			tcf_hash_release(a, bind);
 		return -EINVAL;
+	}
 
-	if (!tcf_hash_check(tn, index, a, bind)) {
+	if (!exists) {
 		ret = tcf_hash_create(tn, index, est, a, sizeof(*ipt), bind,
 				      false);
 		if (ret)


Patches currently in stable-queue which might be from xiyou.wangcong@gmail.com are

queue-4.6/netem-fix-a-use-after-free.patch
queue-4.6/net_sched-fix-pfifo_head_drop-behavior-vs-backlog.patch
queue-4.6/act_ipt-fix-a-bind-refcnt-leak.patch

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-07-06 23:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-06 23:56 Patch "act_ipt: fix a bind refcnt leak" has been added to the 4.6-stable tree gregkh

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.