diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-04-24 17:16:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-04-24 17:27:30 -0700 |
| commit | 55fe5866366ae42f259f27ae5962eb267d9ce172 (patch) | |
| tree | ff7b8f5b97a6d21b1f30ffd43f2e6955ff376c69 /include | |
| parent | 44adf28f4a27df626d50e54c8d0669df2dd1aa89 (diff) | |
| download | linux-3.10-55fe5866366ae42f259f27ae5962eb267d9ce172.tar.gz linux-3.10-55fe5866366ae42f259f27ae5962eb267d9ce172.tar.bz2 linux-3.10-55fe5866366ae42f259f27ae5962eb267d9ce172.zip | |
[NETFILTER]: Fix compat_xt_counters alignment for non-x86
Some (?) non-x86 architectures require 8byte alignment for u_int64_t
even when compiled for 32bit, using u_int32_t in compat_xt_counters
breaks on these architectures, use u_int64_t for everything but x86.
Reported by Andreas Schwab <schwab@suse.de>.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index f6bdef82a32..38701454e19 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -361,7 +361,11 @@ struct compat_xt_entry_target struct compat_xt_counters { +#if defined(CONFIG_X86_64) || defined(CONFIG_IA64) u_int32_t cnt[4]; +#else + u_int64_t cnt[2]; +#endif }; struct compat_xt_counters_info |