summaryrefslogtreecommitdiffstats
path: root/net/netfilter/xt_connbytes.c
diff options
context:
space:
mode:
authorPatrick McHardy2006-03-21 03:01:58 +0100
committerDavid S. Miller2006-03-21 03:01:58 +0100
commit5d04bff096180f032de8b9b12153a8a1b4009b8d (patch)
tree58aa8a8177b6d07cbce8b0c0bedeb23ecbde74d8 /net/netfilter/xt_connbytes.c
parent[NETFILTER]: Convert ip6_tables matches/targets to centralized error checking (diff)
downloadkernel-qcow2-linux-5d04bff096180f032de8b9b12153a8a1b4009b8d.tar.gz
kernel-qcow2-linux-5d04bff096180f032de8b9b12153a8a1b4009b8d.tar.xz
kernel-qcow2-linux-5d04bff096180f032de8b9b12153a8a1b4009b8d.zip
[NETFILTER]: Convert x_tables matches/targets to centralized error checking
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/xt_connbytes.c')
-rw-r--r--net/netfilter/xt_connbytes.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index 150d2a4b0f71..d9851358ff49 100644
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -128,9 +128,6 @@ static int check(const char *tablename,
{
const struct xt_connbytes_info *sinfo = matchinfo;
- if (matchsize != XT_ALIGN(sizeof(struct xt_connbytes_info)))
- return 0;
-
if (sinfo->what != XT_CONNBYTES_PKTS &&
sinfo->what != XT_CONNBYTES_BYTES &&
sinfo->what != XT_CONNBYTES_AVGPKT)
@@ -146,14 +143,16 @@ static int check(const char *tablename,
static struct xt_match connbytes_match = {
.name = "connbytes",
- .match = &match,
- .checkentry = &check,
+ .match = match,
+ .checkentry = check,
+ .matchsize = sizeof(struct xt_connbytes_info),
.me = THIS_MODULE
};
static struct xt_match connbytes6_match = {
.name = "connbytes",
- .match = &match,
- .checkentry = &check,
+ .match = match,
+ .checkentry = check,
+ .matchsize = sizeof(struct xt_connbytes_info),
.me = THIS_MODULE
};