netfilter: xt_recent: fix regression in rules using a zero hit_count
authorPatrick McHardy <kaber@trash.net>
Mon, 22 Mar 2010 17:25:20 +0000 (18:25 +0100)
committerPatrick McHardy <kaber@trash.net>
Mon, 22 Mar 2010 17:25:20 +0000 (18:25 +0100)
Commit 8ccb92ad (netfilter: xt_recent: fix false match) fixed supposedly
false matches in rules using a zero hit_count. As it turns out there is
nothing false about these matches and people are actually using entries
with a hit_count of zero to make rules dependant on addresses inserted
manually through /proc.

Since this slipped past the eyes of three reviewers, instead of
reverting the commit in question, this patch explicitly checks
for a hit_count of zero to make the intentions more clear.

Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Cc: stable@kernel.org
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/netfilter/xt_recent.c

index 7073dbb8100c83fb163498453d814beed8fd2dbe..971d172afecee06b6000261526f334ca23cfa095 100644 (file)
@@ -267,7 +267,7 @@ recent_mt(const struct sk_buff *skb, const struct xt_match_param *par)
                for (i = 0; i < e->nstamps; i++) {
                        if (info->seconds && time_after(time, e->stamps[i]))
                                continue;
-                       if (info->hit_count && ++hits >= info->hit_count) {
+                       if (!info->hit_count || ++hits >= info->hit_count) {
                                ret = !ret;
                                break;
                        }