From: David S. Miller Date: Fri, 1 Jun 2018 17:25:41 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ccfde6e27d9566bee596d41a2cc6f158af8595d5;p=linux.git 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 --- ccfde6e27d9566bee596d41a2cc6f158af8595d5