diff options
author | 2010-02-15 18:16:26 +0100 | |
---|---|---|
committer | 2010-02-15 18:16:26 +0100 | |
commit | fc0e3df4f00a5f62c2f2fce84bf496136b58c474 (patch) | |
tree | 125f13701139403481c985919ecdea8d04f45940 /net/bridge/netfilter/ebt_log.c | |
parent | netfilter: ebtables: abort if next_offset is too small (diff) | |
download | linux-fc0e3df4f00a5f62c2f2fce84bf496136b58c474.tar.gz linux-fc0e3df4f00a5f62c2f2fce84bf496136b58c474.tar.bz2 linux-fc0e3df4f00a5f62c2f2fce84bf496136b58c474.zip |
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_log.c')
-rw-r--r-- | net/bridge/netfilter/ebt_log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index e4ea3fdd1d41..e873924ddb5d 100644 --- a/net/bridge/netfilter/ebt_log.c +++ b/net/bridge/netfilter/ebt_log.c @@ -195,7 +195,7 @@ static struct xt_target ebt_log_tg_reg __read_mostly = { .family = NFPROTO_BRIDGE, .target = ebt_log_tg, .checkentry = ebt_log_tg_check, - .targetsize = XT_ALIGN(sizeof(struct ebt_log_info)), + .targetsize = sizeof(struct ebt_log_info), .me = THIS_MODULE, }; |