Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Fri, 1 Jun 2018 17:25:41 +0000 (13:25 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Jun 2018 17:25:41 +0000 (13:25 -0400)
commitccfde6e27d9566bee596d41a2cc6f158af8595d5
treeafc718c79fd75ed746ea4796a045125d1aac4827
parenta95691bc54af1ac4b12c354f91e9cabf1cb068df
parent38369f54d97dd7dc50c73a2797bfeb53c2e87d2d
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
pull request (net): ipsec 2018-05-31

1) Avoid possible overflow of the offset variable
   in  _decode_session6(), this fixes an infinite
   lookp there. From Eric Dumazet.

2) We may use an error pointer in the error path of
   xfrm_bundle_create(). Fix this by returning this
   pointer directly to the caller.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>