mbox

pull request (net): ipsec 2017-04-19

Message ID 1492578636-621-1-git-send-email-steffen.klassert@secunet.com
State Accepted, archived
Delegated to: David Miller
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master

Message

Steffen Klassert April 19, 2017, 5:10 a.m. UTC
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.

Thanks!

The following changes since commit 75514b6654859e0130b512396dc964d2a9e84967:

  net: ethernet: ti: cpsw: wake tx queues on ndo_tx_timeout (2017-04-02 19:42:44 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master

for you to fetch changes up to 096f41d3a8fcbb8dde7f71379b1ca85fe213eded:

  af_key: Fix sadb_x_ipsecrequest parsing (2017-04-18 08:26:03 +0200)

----------------------------------------------------------------
Herbert Xu (1):
      af_key: Fix sadb_x_ipsecrequest parsing

Yuejie Shi (1):
      af_key: Add lock to key dump

 net/key/af_key.c | 93 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 64 insertions(+), 29 deletions(-)

Comments

David Miller April 20, 2017, 8:20 p.m. UTC | #1
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 19 Apr 2017 07:10:34 +0200

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

Pulled, thanks Steffen.