Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc0e3df4 authored by Florian Westphal's avatar Florian Westphal Committed by Patrick McHardy
Browse files

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: default avatarFlorian Westphal <fwestphal@astaro.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 1756de26

net/bridge/netfilter/ebt_802_3.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static struct xt_match ebt_802_3_mt_reg __read_mostly = { 
	.family		= NFPROTO_BRIDGE,

	.match		= ebt_802_3_mt,

	.checkentry	= ebt_802_3_mt_check,

	.matchsize	= XT_ALIGN(sizeof(struct ebt_802_3_info)),

	.matchsize	= sizeof(struct ebt_802_3_info),

	.me		= THIS_MODULE,

};

net/bridge/netfilter/ebt_arp.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static struct xt_match ebt_arp_mt_reg __read_mostly = { 
	.family		= NFPROTO_BRIDGE,

	.match		= ebt_arp_mt,

	.checkentry	= ebt_arp_mt_check,

	.matchsize	= XT_ALIGN(sizeof(struct ebt_arp_info)),

	.matchsize	= sizeof(struct ebt_arp_info),

	.me		= THIS_MODULE,

};

net/bridge/netfilter/ebt_arpreply.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static struct xt_target ebt_arpreply_tg_reg __read_mostly = { 
	.hooks		= (1 << NF_BR_NUMHOOKS) | (1 << NF_BR_PRE_ROUTING),

	.target		= ebt_arpreply_tg,

	.checkentry	= ebt_arpreply_tg_check,

	.targetsize	= XT_ALIGN(sizeof(struct ebt_arpreply_info)),

	.targetsize	= sizeof(struct ebt_arpreply_info),

	.me		= THIS_MODULE,

};

net/bridge/netfilter/ebt_dnat.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct xt_target ebt_dnat_tg_reg __read_mostly = { 
			  (1 << NF_BR_LOCAL_OUT) | (1 << NF_BR_BROUTING),

	.target		= ebt_dnat_tg,

	.checkentry	= ebt_dnat_tg_check,

	.targetsize	= XT_ALIGN(sizeof(struct ebt_nat_info)),

	.targetsize	= sizeof(struct ebt_nat_info),

	.me		= THIS_MODULE,

};

net/bridge/netfilter/ebt_ip.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static struct xt_match ebt_ip_mt_reg __read_mostly = { 
	.family		= NFPROTO_BRIDGE,

	.match		= ebt_ip_mt,

	.checkentry	= ebt_ip_mt_check,

	.matchsize	= XT_ALIGN(sizeof(struct ebt_ip_info)),

	.matchsize	= sizeof(struct ebt_ip_info),

	.me		= THIS_MODULE,

};