Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[deliverable/linux.git] / net / netfilter / xt_cgroup.c

diff --git a/net/netfilter/xt_cgroup.c b/net/netfilter/xt_cgroup.c
index 9a8e77e7f8d42d4e3c7dd02d9c80b4a54311f5b0..7198d660b4dea1e9e79c6f9a13f4e6669bca569d 100644 (file)
--- 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
@@ -54,7 +54,8 @@ static struct xt_match cgroup_mt_reg __read_mostly = {
        .matchsize  = sizeof(struct xt_cgroup_info),
        .me         = THIS_MODULE,
        .hooks      = (1 << NF_INET_LOCAL_OUT) |
-                     (1 << NF_INET_POST_ROUTING),
+                     (1 << NF_INET_POST_ROUTING) |
+                     (1 << NF_INET_LOCAL_IN),
 };
 
 static int __init cgroup_mt_init(void)