From: Steffen Klassert Subject: pull request (net): ipsec 2018-12-18 Date: Tue, 18 Dec 2018 11:37:31 +0100 Message-ID: <20181218103735.5268-1-steffen.klassert@secunet.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Herbert Xu , Steffen Klassert , To: David Miller Return-path: Received: from a.mx.secunet.com ([62.96.220.36]:58612 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726426AbeLRKhn (ORCPT ); Tue, 18 Dec 2018 05:37:43 -0500 Sender: netdev-owner@vger.kernel.org List-ID: 1) Fix error return code in xfrm_output_one() when no dst_entry is attached to the skb. From Wei Yongjun. 2) The xfrm state hash bucket count reported to userspace is off by one. Fix from Benjamin Poirier. 3) Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry. 4) Fix freeing of xfrm states on acquire. We use a dedicated slab cache for the xfrm states now, so free it properly with kmem_cache_free. From Mathias Krause. Please pull or let me know if there are problems. Thanks! The following changes since commit 6788fac82001ed1944b5da976bcec4a7b9accf51: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2018-10-26 21:41:49 -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 4a135e538962cb00a9667c82e7d2b9e4d7cd7177: xfrm_user: fix freeing of xfrm states on acquire (2018-11-23 07:51:32 +0100) ---------------------------------------------------------------- Benjamin Poirier (1): xfrm: Fix bucket count reported to userspace Mathias Krause (1): xfrm_user: fix freeing of xfrm states on acquire Steffen Klassert (1): xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry. Wei Yongjun (1): xfrm: Fix error return code in xfrm_output_one() include/net/xfrm.h | 1 + net/xfrm/xfrm_input.c | 7 ++++++- net/xfrm/xfrm_output.c | 1 + net/xfrm/xfrm_state.c | 10 ++++++++-- net/xfrm/xfrm_user.c | 4 ++-- 5 files changed, 18 insertions(+), 5 deletions(-)