summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-10-30 20:51:56 +0900
committerDavid S. Miller <davem@davemloft.net>2015-10-30 20:51:56 +0900
commite7b63ff115f21ea6c609cbb08f3d489af627af6e (patch)
treea5d13243312abb6ba01e9115178765482af9392c /samples
parenta493bcf8d6caf28f062c5f8f2ba486fdbf1ae899 (diff)
parentcb866e3298cd7412503fc7e2c265753c853fab9d (diff)
downloadlinux-e7b63ff115f21ea6c609cbb08f3d489af627af6e.tar.gz
linux-e7b63ff115f21ea6c609cbb08f3d489af627af6e.tar.bz2
linux-e7b63ff115f21ea6c609cbb08f3d489af627af6e.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2015-10-30 1) The flow cache is limited by the flow cache limit which depends on the number of cpus and the xfrm garbage collector threshold which is independent of the number of cpus. This leads to the fact that on systems with more than 16 cpus we hit the xfrm garbage collector limit and refuse new allocations, so new flows are dropped. On systems with 16 or less cpus, we hit the flowcache limit. In this case, we shrink the flow cache instead of refusing new flows. We increase the xfrm garbage collector threshold to INT_MAX to get the same behaviour, independent of the number of cpus. 2) Fix some unaligned accesses on sparc systems. From Sowmini Varadhan. 3) Fix some header checks in _decode_session4. We may call pskb_may_pull with a negative value converted to unsigened int from pskb_may_pull. This can lead to incorrect policy lookups. We fix this by a check of the data pointer position before we call pskb_may_pull. 4) Reload skb header pointers after calling pskb_may_pull in _decode_session4 as this may change the pointers into the packet. 5) Add a missing statistic counter on inner mode errors. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions