From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 4/6 -stable] netfilter: x_tables: allow to use default cgroup match
Date: Fri, 26 Sep 2014 13:43:42 +0200 [thread overview]
Message-ID: <1411731824-15051-5-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1411731824-15051-1-git-send-email-pablo@netfilter.org>
From: Daniel Borkmann <dborkman@redhat.com>
[ upstream commit caa8ad94edf686d02b555c65a6162c0d1b434958 ]
There's actually no good reason why we cannot use cgroup id 0,
so lets just remove this artificial barrier.
Cc: <stable@vger.kernel.org> # 3.16.x
Cc: <stable@vger.kernel.org> # 3.14.x
Reported-by: Alexey Perevalov <a.perevalov@samsung.com>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Tested-by: Alexey Perevalov <a.perevalov@samsung.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/xt_cgroup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/xt_cgroup.c b/net/netfilter/xt_cgroup.c
index f4e8330..7198d66 100644
--- a/net/netfilter/xt_cgroup.c
+++ b/net/netfilter/xt_cgroup.c
@@ -31,7 +31,7 @@ static int cgroup_mt_check(const struct xt_mtchk_param *par)
if (info->invert & ~1)
return -EINVAL;
- return info->id ? 0 : -EINVAL;
+ return 0;
}
static bool
--
1.7.10.4
next prev parent reply other threads:[~2014-09-26 11:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-26 11:43 [PATCH 0/6 -stable] netfilter/ipvs patches Pablo Neira Ayuso
2014-09-26 11:43 ` [PATCH 1/6 -stable] ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack Pablo Neira Ayuso
2014-09-26 11:43 ` [PATCH 2/6 -stable] netfilter: xt_hashlimit: perform garbage collection from process context Pablo Neira Ayuso
2014-09-26 11:43 ` [PATCH 3/6 -stable] ipvs: Maintain all DSCP and ECN bits for ipv6 tun forwarding Pablo Neira Ayuso
2014-09-26 11:43 ` Pablo Neira Ayuso [this message]
2014-09-26 11:43 ` [PATCH 5/6 -stable] ipvs: fix ipv6 hook registration for local replies Pablo Neira Ayuso
2014-09-26 11:43 ` [PATCH 6/6 -stable] netfilter: nf_tables: don't update chain with unset counters Pablo Neira Ayuso
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=1411731824-15051-5-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/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).