diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-20 22:19:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-20 22:19:46 +0200 |
| commit | 12a0a6c05471176a453e324d0d5e51c6f381ad63 (patch) | |
| tree | 25bca6aabd24d4cefe0bd827f1b1e6a731857f69 /net/mac80211 | |
| parent | dp83640: don't recieve time stamps twice (diff) | |
| parent | af_key: Fix sadb_x_ipsecrequest parsing (diff) | |
| download | linux-12a0a6c05471176a453e324d0d5e51c6f381ad63.tar.xz linux-12a0a6c05471176a453e324d0d5e51c6f381ad63.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2017-04-19
Two fixes for af_key:
1) Add a lock to key dump to prevent a NULL pointer dereference.
From Yuejie Shi.
2) Fix slab-out-of-bounds in parse_ipsecrequests.
From Herbert Xu.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
0 files changed, 0 insertions, 0 deletions