summaryrefslogtreecommitdiff
path: root/lib/cpu_rmap.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-12-29 00:24:28 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-29 00:24:28 -0500
commita72338a00ed19f68bb08a1b46dad5a315e562ed9 (patch)
treeb611bf5c2f284f0423fde24ac5c8692c03135f68 /lib/cpu_rmap.c
parent6a9eadccff2926e392173a989042f14c867cffbf (diff)
parent2ee0d3c80fdb7974cfa1c7e25b5048e9fcaf69b6 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter/IPVS fixes for net This patchset contains four nf_tables fixes, one IPVS fix due to missing updates in the interaction with the new sedadj conntrack extension that was added to support the netfilter synproxy code, and a couple of one-liners to fix netnamespace netfilter issues. More specifically, they are: * Fix ipv6_find_hdr() call without offset being explicitly initialized in nft_exthdr, as required by that function, from Daniel Borkmann. * Fix oops in nfnetlink_log when using netns and unloading the kernel module, from Gao feng. * Fix BUG_ON in nf_ct_timestamp extension after netns is destroyed, from Helmut Schaa. * Fix crash in IPVS due to missing sequence adjustment extension being allocated in the conntrack, from Jesper Dangaard Brouer. * Add bugtrap to spot a warning in case you deference sequence adjustment conntrack area when not available, this should help to catch similar invalid dereferences in the Netfilter tree, also from Jesper. * Fix incomplete dumping of sets in nf_tables when retrieving by family, from me. * Fix oops when updating the table state (dormant <-> active) and having user (not base ) chains, from me. * Fix wrong validation in set element data that results in returning -EINVAL when using the nf_tables dictionary feature with mappings, also from me. We don't usually have this amount of fixes by this time (as we're already in -rc5 of the development cycle), although half of them are related to nf_tables which is a relatively new thing, and I also believe that holidays have also delayed the flight of bugfixes to mainstream a bit. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/cpu_rmap.c')
0 files changed, 0 insertions, 0 deletions