From: David S. Miller <davem@davemloft.net>
Date: Thu, 20 Apr 2017 20:19:46 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
X-Git-Tag: android-x86-8.1-r1~3730^2~14
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=12a0a6c05471176a453e324d0d5e51c6f381ad63;p=android-x86%2Fkernel.git

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>
---

12a0a6c05471176a453e324d0d5e51c6f381ad63