diff options
author | Florian Westphal <fwestphal@astaro.com> | 2010-02-15 18:16:26 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-15 18:16:26 +0100 |
commit | fc0e3df4f00a5f62c2f2fce84bf496136b58c474 (patch) | |
tree | 125f13701139403481c985919ecdea8d04f45940 /net/bridge/netfilter/ebt_ip6.c | |
parent | 1756de262e41112a8a8927808eb2f03d21fd4786 (diff) | |
download | op-kernel-dev-fc0e3df4f00a5f62c2f2fce84bf496136b58c474.zip op-kernel-dev-fc0e3df4f00a5f62c2f2fce84bf496136b58c474.tar.gz |
netfilter: ebtables: avoid explicit XT_ALIGN() in match/targets
This will cause trouble once CONFIG_COMPAT support is added to ebtables.
xt_compat_*_offset() calculate the kernel/userland structure size delta
using:
XT_ALIGN(size) - COMPAT_XT_ALIGN(size)
If the match/target sizes are aligned at registration time,
delta is always zero.
Should have zero effect for existing systems: xtables uses
XT_ALIGN() whenever it deals with match/target sizes.
Signed-off-by: Florian Westphal <fwestphal@astaro.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/bridge/netfilter/ebt_ip6.c')
-rw-r--r-- | net/bridge/netfilter/ebt_ip6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c index 784a657..bbf2534 100644 --- a/net/bridge/netfilter/ebt_ip6.c +++ b/net/bridge/netfilter/ebt_ip6.c @@ -122,7 +122,7 @@ static struct xt_match ebt_ip6_mt_reg __read_mostly = { .family = NFPROTO_BRIDGE, .match = ebt_ip6_mt, .checkentry = ebt_ip6_mt_check, - .matchsize = XT_ALIGN(sizeof(struct ebt_ip6_info)), + .matchsize = sizeof(struct ebt_ip6_info), .me = THIS_MODULE, }; |