projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d386cd 096f41d)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Thu, 20 Apr 2017 20:19:46 +0000 (16:19 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Apr 2017 20:19:46 +0000 (16:19 -0400)
commit12a0a6c05471176a453e324d0d5e51c6f381ad63
tree25bca6aabd24d4cefe0bd827f1b1e6a731857f69tree | snapshot
parent9d386cd9a755c8293e8916264d4d053878a7c9c7commit | diff
parent096f41d3a8fcbb8dde7f71379b1ca85fe213ededcommit | diff
Merge branch 'master' of git://git./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>
John Crispins staging tree