path: root/net/bridge/br_multicast.c
diff options
authorDavid S. Miller <davem@davemloft.net>2015-05-28 20:41:35 -0700
committerDavid S. Miller <davem@davemloft.net>2015-05-28 20:41:35 -0700
commit5aab0e8a45e2c15930af9aea7f461bf57ad8efe3 (patch)
treea34c7d50b993bb5e97ab058e32c6a195de7ddae4 /net/bridge/br_multicast.c
parent210347e1846d391aea863fb69165a2d70581f838 (diff)
parentd55c670cbc54b2270a465cdc382ce71adae45785 (diff)
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 'net/bridge/br_multicast.c')
0 files changed, 0 insertions, 0 deletions

Privacy Policy