Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for net: 1) Remove IP MASQUERADING record in MAINTAINERS file, from Denis Efremov. 2) Counter arguments are swapped in ebtables, from Todd Seidelmann. 3) Missing netlink attribute validation in flow_offload extension. 4) Incorrect alignment in xt_nfacct that breaks 32-bits userspace / 64-bits kernels, from Juliana Rodrigueiro. 5) Missing include guard in nf_conntrack_h323_types.h, from Masahiro Yamada. ====================
Showing the changes to include/uapi/linux (1 of 6 files). Show all
Unified · Split
| @@ -11,4 +11,9 @@ struct xt_nfacct_match_info { · 10 unmodified lines | |||
| 11 | struct nf_acct *nfacct; | 11 | struct nf_acct *nfacct; |
| 12 | }; | 12 | }; |
| 13 | 13 | ||
| 14 | struct xt_nfacct_match_info_v1 { | ||
| 15 | char name[NFACCT_NAME_MAX]; | ||
| 16 | struct nf_acct *nfacct __attribute__((aligned(8))); | ||
| 17 | }; | ||
| 18 | |||
| 14 | #endif /* _XT_NFACCT_MATCH_H */ | 19 | #endif /* _XT_NFACCT_MATCH_H */ |