diff options
author | Florian Westphal <fwestphal@astaro.com> | 2010-02-15 12:16:26 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-15 12:16:26 -0500 |
commit | fc0e3df4f00a5f62c2f2fce84bf496136b58c474 (patch) | |
tree | 125f13701139403481c985919ecdea8d04f45940 /net | |
parent | 1756de262e41112a8a8927808eb2f03d21fd4786 (diff) |
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')
-rw-r--r-- | net/bridge/netfilter/ebt_802_3.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_arp.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_arpreply.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_dnat.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_ip.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_ip6.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_limit.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_log.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_mark.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_mark_m.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_nflog.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_pkttype.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_redirect.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_snat.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_stp.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_ulog.c | 2 | ||||
-rw-r--r-- | net/bridge/netfilter/ebt_vlan.c | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/net/bridge/netfilter/ebt_802_3.c b/net/bridge/netfilter/ebt_802_3.c index bd91dc58d49b..5d1176758ca5 100644 --- a/net/bridge/netfilter/ebt_802_3.c +++ b/net/bridge/netfilter/ebt_802_3.c | |||
@@ -52,7 +52,7 @@ static struct xt_match ebt_802_3_mt_reg __read_mostly = { | |||
52 | .family = NFPROTO_BRIDGE, | 52 | .family = NFPROTO_BRIDGE, |
53 | .match = ebt_802_3_mt, | 53 | .match = ebt_802_3_mt, |
54 | .checkentry = ebt_802_3_mt_check, | 54 | .checkentry = ebt_802_3_mt_check, |
55 | .matchsize = XT_ALIGN(sizeof(struct ebt_802_3_info)), | 55 | .matchsize = sizeof(struct ebt_802_3_info), |
56 | .me = THIS_MODULE, | 56 | .me = THIS_MODULE, |
57 | }; | 57 | }; |
58 | 58 | ||
diff --git a/net/bridge/netfilter/ebt_arp.c b/net/bridge/netfilter/ebt_arp.c index b7ad60419f9a..e727697c5847 100644 --- a/net/bridge/netfilter/ebt_arp.c +++ b/net/bridge/netfilter/ebt_arp.c | |||
@@ -120,7 +120,7 @@ static struct xt_match ebt_arp_mt_reg __read_mostly = { | |||
120 | .family = NFPROTO_BRIDGE, | 120 | .family = NFPROTO_BRIDGE, |
121 | .match = ebt_arp_mt, | 121 | .match = ebt_arp_mt, |
122 | .checkentry = ebt_arp_mt_check, | 122 | .checkentry = ebt_arp_mt_check, |
123 | .matchsize = XT_ALIGN(sizeof(struct ebt_arp_info)), | 123 | .matchsize = sizeof(struct ebt_arp_info), |
124 | .me = THIS_MODULE, | 124 | .me = THIS_MODULE, |
125 | }; | 125 | }; |
126 | 126 | ||
diff --git a/net/bridge/netfilter/ebt_arpreply.c b/net/bridge/netfilter/ebt_arpreply.c index 76584cd72e57..f392e9d93f53 100644 --- a/net/bridge/netfilter/ebt_arpreply.c +++ b/net/bridge/netfilter/ebt_arpreply.c | |||
@@ -78,7 +78,7 @@ static struct xt_target ebt_arpreply_tg_reg __read_mostly = { | |||
78 | .hooks = (1 << NF_BR_NUMHOOKS) | (1 << NF_BR_PRE_ROUTING), | 78 | .hooks = (1 << NF_BR_NUMHOOKS) | (1 << NF_BR_PRE_ROUTING), |
79 | .target = ebt_arpreply_tg, | 79 | .target = ebt_arpreply_tg, |
80 | .checkentry = ebt_arpreply_tg_check, | 80 | .checkentry = ebt_arpreply_tg_check, |
81 | .targetsize = XT_ALIGN(sizeof(struct ebt_arpreply_info)), | 81 | .targetsize = sizeof(struct ebt_arpreply_info), |
82 | .me = THIS_MODULE, | 82 | .me = THIS_MODULE, |
83 | }; | 83 | }; |
84 | 84 | ||
diff --git a/net/bridge/netfilter/ebt_dnat.c b/net/bridge/netfilter/ebt_dnat.c index 6b49ea9e31fb..2bb40d728a35 100644 --- a/net/bridge/netfilter/ebt_dnat.c +++ b/net/bridge/netfilter/ebt_dnat.c | |||
@@ -54,7 +54,7 @@ static struct xt_target ebt_dnat_tg_reg __read_mostly = { | |||
54 | (1 << NF_BR_LOCAL_OUT) | (1 << NF_BR_BROUTING), | 54 | (1 << NF_BR_LOCAL_OUT) | (1 << NF_BR_BROUTING), |
55 | .target = ebt_dnat_tg, | 55 | .target = ebt_dnat_tg, |
56 | .checkentry = ebt_dnat_tg_check, | 56 | .checkentry = ebt_dnat_tg_check, |
57 | .targetsize = XT_ALIGN(sizeof(struct ebt_nat_info)), | 57 | .targetsize = sizeof(struct ebt_nat_info), |
58 | .me = THIS_MODULE, | 58 | .me = THIS_MODULE, |
59 | }; | 59 | }; |
60 | 60 | ||
diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c index d771bbfbcbe6..5de6df6f86b8 100644 --- a/net/bridge/netfilter/ebt_ip.c +++ b/net/bridge/netfilter/ebt_ip.c | |||
@@ -110,7 +110,7 @@ static struct xt_match ebt_ip_mt_reg __read_mostly = { | |||
110 | .family = NFPROTO_BRIDGE, | 110 | .family = NFPROTO_BRIDGE, |
111 | .match = ebt_ip_mt, | 111 | .match = ebt_ip_mt, |
112 | .checkentry = ebt_ip_mt_check, | 112 | .checkentry = ebt_ip_mt_check, |
113 | .matchsize = XT_ALIGN(sizeof(struct ebt_ip_info)), | 113 | .matchsize = sizeof(struct ebt_ip_info), |
114 | .me = THIS_MODULE, | 114 | .me = THIS_MODULE, |
115 | }; | 115 | }; |
116 | 116 | ||
diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c index 784a6573876c..bbf2534ef026 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 = { | |||
122 | .family = NFPROTO_BRIDGE, | 122 | .family = NFPROTO_BRIDGE, |
123 | .match = ebt_ip6_mt, | 123 | .match = ebt_ip6_mt, |
124 | .checkentry = ebt_ip6_mt_check, | 124 | .checkentry = ebt_ip6_mt_check, |
125 | .matchsize = XT_ALIGN(sizeof(struct ebt_ip6_info)), | 125 | .matchsize = sizeof(struct ebt_ip6_info), |
126 | .me = THIS_MODULE, | 126 | .me = THIS_MODULE, |
127 | }; | 127 | }; |
128 | 128 | ||
diff --git a/net/bridge/netfilter/ebt_limit.c b/net/bridge/netfilter/ebt_limit.c index f7bd9192ff0c..9dd16e6b10e7 100644 --- a/net/bridge/netfilter/ebt_limit.c +++ b/net/bridge/netfilter/ebt_limit.c | |||
@@ -90,7 +90,7 @@ static struct xt_match ebt_limit_mt_reg __read_mostly = { | |||
90 | .family = NFPROTO_BRIDGE, | 90 | .family = NFPROTO_BRIDGE, |
91 | .match = ebt_limit_mt, | 91 | .match = ebt_limit_mt, |
92 | .checkentry = ebt_limit_mt_check, | 92 | .checkentry = ebt_limit_mt_check, |
93 | .matchsize = XT_ALIGN(sizeof(struct ebt_limit_info)), | 93 | .matchsize = sizeof(struct ebt_limit_info), |
94 | .me = THIS_MODULE, | 94 | .me = THIS_MODULE, |
95 | }; | 95 | }; |
96 | 96 | ||
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 = { | |||
195 | .family = NFPROTO_BRIDGE, | 195 | .family = NFPROTO_BRIDGE, |
196 | .target = ebt_log_tg, | 196 | .target = ebt_log_tg, |
197 | .checkentry = ebt_log_tg_check, | 197 | .checkentry = ebt_log_tg_check, |
198 | .targetsize = XT_ALIGN(sizeof(struct ebt_log_info)), | 198 | .targetsize = sizeof(struct ebt_log_info), |
199 | .me = THIS_MODULE, | 199 | .me = THIS_MODULE, |
200 | }; | 200 | }; |
201 | 201 | ||
diff --git a/net/bridge/netfilter/ebt_mark.c b/net/bridge/netfilter/ebt_mark.c index 2fee7e8e2e93..153e167374a2 100644 --- a/net/bridge/netfilter/ebt_mark.c +++ b/net/bridge/netfilter/ebt_mark.c | |||
@@ -59,7 +59,7 @@ static struct xt_target ebt_mark_tg_reg __read_mostly = { | |||
59 | .family = NFPROTO_BRIDGE, | 59 | .family = NFPROTO_BRIDGE, |
60 | .target = ebt_mark_tg, | 60 | .target = ebt_mark_tg, |
61 | .checkentry = ebt_mark_tg_check, | 61 | .checkentry = ebt_mark_tg_check, |
62 | .targetsize = XT_ALIGN(sizeof(struct ebt_mark_t_info)), | 62 | .targetsize = sizeof(struct ebt_mark_t_info), |
63 | .me = THIS_MODULE, | 63 | .me = THIS_MODULE, |
64 | }; | 64 | }; |
65 | 65 | ||
diff --git a/net/bridge/netfilter/ebt_mark_m.c b/net/bridge/netfilter/ebt_mark_m.c index ea570f214b1d..89abf4030399 100644 --- a/net/bridge/netfilter/ebt_mark_m.c +++ b/net/bridge/netfilter/ebt_mark_m.c | |||
@@ -41,7 +41,7 @@ static struct xt_match ebt_mark_mt_reg __read_mostly = { | |||
41 | .family = NFPROTO_BRIDGE, | 41 | .family = NFPROTO_BRIDGE, |
42 | .match = ebt_mark_mt, | 42 | .match = ebt_mark_mt, |
43 | .checkentry = ebt_mark_mt_check, | 43 | .checkentry = ebt_mark_mt_check, |
44 | .matchsize = XT_ALIGN(sizeof(struct ebt_mark_m_info)), | 44 | .matchsize = sizeof(struct ebt_mark_m_info), |
45 | .me = THIS_MODULE, | 45 | .me = THIS_MODULE, |
46 | }; | 46 | }; |
47 | 47 | ||
diff --git a/net/bridge/netfilter/ebt_nflog.c b/net/bridge/netfilter/ebt_nflog.c index 2a63d996dd4e..40dbd248b9ae 100644 --- a/net/bridge/netfilter/ebt_nflog.c +++ b/net/bridge/netfilter/ebt_nflog.c | |||
@@ -51,7 +51,7 @@ static struct xt_target ebt_nflog_tg_reg __read_mostly = { | |||
51 | .family = NFPROTO_BRIDGE, | 51 | .family = NFPROTO_BRIDGE, |
52 | .target = ebt_nflog_tg, | 52 | .target = ebt_nflog_tg, |
53 | .checkentry = ebt_nflog_tg_check, | 53 | .checkentry = ebt_nflog_tg_check, |
54 | .targetsize = XT_ALIGN(sizeof(struct ebt_nflog_info)), | 54 | .targetsize = sizeof(struct ebt_nflog_info), |
55 | .me = THIS_MODULE, | 55 | .me = THIS_MODULE, |
56 | }; | 56 | }; |
57 | 57 | ||
diff --git a/net/bridge/netfilter/ebt_pkttype.c b/net/bridge/netfilter/ebt_pkttype.c index 883e96e2a542..e2a07e6cbef3 100644 --- a/net/bridge/netfilter/ebt_pkttype.c +++ b/net/bridge/netfilter/ebt_pkttype.c | |||
@@ -36,7 +36,7 @@ static struct xt_match ebt_pkttype_mt_reg __read_mostly = { | |||
36 | .family = NFPROTO_BRIDGE, | 36 | .family = NFPROTO_BRIDGE, |
37 | .match = ebt_pkttype_mt, | 37 | .match = ebt_pkttype_mt, |
38 | .checkentry = ebt_pkttype_mt_check, | 38 | .checkentry = ebt_pkttype_mt_check, |
39 | .matchsize = XT_ALIGN(sizeof(struct ebt_pkttype_info)), | 39 | .matchsize = sizeof(struct ebt_pkttype_info), |
40 | .me = THIS_MODULE, | 40 | .me = THIS_MODULE, |
41 | }; | 41 | }; |
42 | 42 | ||
diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c index c8a49f7a57ba..9be8fbcd370b 100644 --- a/net/bridge/netfilter/ebt_redirect.c +++ b/net/bridge/netfilter/ebt_redirect.c | |||
@@ -59,7 +59,7 @@ static struct xt_target ebt_redirect_tg_reg __read_mostly = { | |||
59 | (1 << NF_BR_BROUTING), | 59 | (1 << NF_BR_BROUTING), |
60 | .target = ebt_redirect_tg, | 60 | .target = ebt_redirect_tg, |
61 | .checkentry = ebt_redirect_tg_check, | 61 | .checkentry = ebt_redirect_tg_check, |
62 | .targetsize = XT_ALIGN(sizeof(struct ebt_redirect_info)), | 62 | .targetsize = sizeof(struct ebt_redirect_info), |
63 | .me = THIS_MODULE, | 63 | .me = THIS_MODULE, |
64 | }; | 64 | }; |
65 | 65 | ||
diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c index 8d04d4c302bd..9c7b520765a2 100644 --- a/net/bridge/netfilter/ebt_snat.c +++ b/net/bridge/netfilter/ebt_snat.c | |||
@@ -67,7 +67,7 @@ static struct xt_target ebt_snat_tg_reg __read_mostly = { | |||
67 | .hooks = (1 << NF_BR_NUMHOOKS) | (1 << NF_BR_POST_ROUTING), | 67 | .hooks = (1 << NF_BR_NUMHOOKS) | (1 << NF_BR_POST_ROUTING), |
68 | .target = ebt_snat_tg, | 68 | .target = ebt_snat_tg, |
69 | .checkentry = ebt_snat_tg_check, | 69 | .checkentry = ebt_snat_tg_check, |
70 | .targetsize = XT_ALIGN(sizeof(struct ebt_nat_info)), | 70 | .targetsize = sizeof(struct ebt_nat_info), |
71 | .me = THIS_MODULE, | 71 | .me = THIS_MODULE, |
72 | }; | 72 | }; |
73 | 73 | ||
diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c index 75e29a9cebda..92a93d363765 100644 --- a/net/bridge/netfilter/ebt_stp.c +++ b/net/bridge/netfilter/ebt_stp.c | |||
@@ -177,7 +177,7 @@ static struct xt_match ebt_stp_mt_reg __read_mostly = { | |||
177 | .family = NFPROTO_BRIDGE, | 177 | .family = NFPROTO_BRIDGE, |
178 | .match = ebt_stp_mt, | 178 | .match = ebt_stp_mt, |
179 | .checkentry = ebt_stp_mt_check, | 179 | .checkentry = ebt_stp_mt_check, |
180 | .matchsize = XT_ALIGN(sizeof(struct ebt_stp_info)), | 180 | .matchsize = sizeof(struct ebt_stp_info), |
181 | .me = THIS_MODULE, | 181 | .me = THIS_MODULE, |
182 | }; | 182 | }; |
183 | 183 | ||
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index ce50688a6431..c6ac657074a6 100644 --- a/net/bridge/netfilter/ebt_ulog.c +++ b/net/bridge/netfilter/ebt_ulog.c | |||
@@ -275,7 +275,7 @@ static struct xt_target ebt_ulog_tg_reg __read_mostly = { | |||
275 | .family = NFPROTO_BRIDGE, | 275 | .family = NFPROTO_BRIDGE, |
276 | .target = ebt_ulog_tg, | 276 | .target = ebt_ulog_tg, |
277 | .checkentry = ebt_ulog_tg_check, | 277 | .checkentry = ebt_ulog_tg_check, |
278 | .targetsize = XT_ALIGN(sizeof(struct ebt_ulog_info)), | 278 | .targetsize = sizeof(struct ebt_ulog_info), |
279 | .me = THIS_MODULE, | 279 | .me = THIS_MODULE, |
280 | }; | 280 | }; |
281 | 281 | ||
diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c index 3dddd489328e..be1dd2e1f615 100644 --- a/net/bridge/netfilter/ebt_vlan.c +++ b/net/bridge/netfilter/ebt_vlan.c | |||
@@ -163,7 +163,7 @@ static struct xt_match ebt_vlan_mt_reg __read_mostly = { | |||
163 | .family = NFPROTO_BRIDGE, | 163 | .family = NFPROTO_BRIDGE, |
164 | .match = ebt_vlan_mt, | 164 | .match = ebt_vlan_mt, |
165 | .checkentry = ebt_vlan_mt_check, | 165 | .checkentry = ebt_vlan_mt_check, |
166 | .matchsize = XT_ALIGN(sizeof(struct ebt_vlan_info)), | 166 | .matchsize = sizeof(struct ebt_vlan_info), |
167 | .me = THIS_MODULE, | 167 | .me = THIS_MODULE, |
168 | }; | 168 | }; |
169 | 169 | ||