diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-29 05:41:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-29 05:41:35 +0200 |
| commit | 5aab0e8a45e2c15930af9aea7f461bf57ad8efe3 (patch) | |
| tree | a34c7d50b993bb5e97ab058e32c6a195de7ddae4 /mm/sparse-vmemmap.c | |
| parent | via-rhine: Resigning as maintainer (diff) | |
| parent | ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call (diff) | |
| download | linux-5aab0e8a45e2c15930af9aea7f461bf57ad8efe3.tar.xz linux-5aab0e8a45e2c15930af9aea7f461bf57ad8efe3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2015-05-28
1) Fix a race in xfrm_state_lookup_byspi, we need to take
the refcount before we release xfrm_state_lock.
From Li RongQing.
2) Fix IV generation on ESN state. We used just the
low order sequence numbers for IV generation on
ESN, as a result the IV can repeat on the same
state. Fix this by using the high order sequence
number bits too and make sure to always initialize
the high order bits with zero. These patches are
serious stable candidates. Fixes from Herbert Xu.
3) Fix the skb->mark handling on vti. We don't
reset skb->mark in skb_scrub_packet anymore,
so vti must care to restore the original
value back after it was used to lookup the
vti policy and state. Fixes from Alexander Duyck.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/sparse-vmemmap.c')
0 files changed, 0 insertions, 0 deletions