This short series addresses some of the netfilter/defrag-related changes recently upstream and backports the equivalent fixes to our compat code. The last two patches address bugs introduced from the second patch, I've left them as separate patches here to mirror the upstream commits.
Tested using kmod tests on Ubuntu 3.13.0-24, 4.2.0-35, and RHEL 3.10.0-327 kernels, plus build tests for vanilla kernels on Travis: https://travis-ci.org/joestringer/openvswitch/builds/124819321 Joe Stringer (5): compat: ipv6: Pass struct net into nf_ct_frag6_gather. compat: nf_defrag_ipv6: avoid/free clone operations. compat: nf_defrag_ipv6: avoid nf_iterate recursion. compat: nf_defrag_ipv6: fix NULL deref panic. datapath: Orphan skbs before IPv6 defrag datapath/conntrack.c | 26 +--- .../include/net/netfilter/ipv6/nf_defrag_ipv6.h | 14 +- datapath/linux/compat/nf_conntrack_reasm.c | 172 +++++++++------------ 3 files changed, 83 insertions(+), 129 deletions(-) -- 2.1.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev