summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2014-08-18 15:46:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-05 13:41:11 -0700
commit7c6d4f8c86252dc5521c4d3f2341827f701ad5fe (patch)
tree79cfc7d247fe958ed196a0ba03014b87be4e9c0a
parentd0b41615828b432ec25fd51b05cd3cac50514856 (diff)
downloadlwn-7c6d4f8c86252dc5521c4d3f2341827f701ad5fe.tar.gz
lwn-7c6d4f8c86252dc5521c4d3f2341827f701ad5fe.zip
netfilter: x_tables: allow to use default cgroup match
commit caa8ad94edf686d02b555c65a6162c0d1b434958 upstream. There's actually no good reason why we cannot use cgroup id 0, so lets just remove this artificial barrier. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/netfilter/xt_cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_cgroup.c b/net/netfilter/xt_cgroup.c
index f4e833005320..7198d660b4de 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