| Message ID | 1473316155-12186-1-git-send-email-steffen.klassert@secunet.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sV9RH2VTzz9ryT for <patchwork-incoming@ozlabs.org>; Thu, 8 Sep 2016 16:29:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752867AbcIHG31 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 8 Sep 2016 02:29:27 -0400 Received: from a.mx.secunet.com ([62.96.220.36]:35790 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751420AbcIHG3Z (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 8 Sep 2016 02:29:25 -0400 Received: from localhost (alg1 [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id B6A871A0792; Thu, 8 Sep 2016 08:29:17 +0200 (CEST) X-Virus-Scanned: by secunet Received: from a.mx.secunet.com ([127.0.0.1]) by localhost (a.mx.secunet.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id orJc1aOGZChP; Thu, 8 Sep 2016 08:29:16 +0200 (CEST) Received: from mail-essen-01.secunet.de (unknown [10.53.40.204]) by a.mx.secunet.com (Postfix) with ESMTP id CCC121A078B; Thu, 8 Sep 2016 08:29:16 +0200 (CEST) Received: from gauss.dd.secunet.de (10.182.7.102) by mail-essen-01.secunet.de (10.53.40.204) with Microsoft SMTP Server id 14.3.301.0; Thu, 8 Sep 2016 08:29:22 +0200 Received: by gauss.dd.secunet.de (Postfix, from userid 1000) id DDF785C0B43; Thu, 8 Sep 2016 08:29:21 +0200 (CEST) From: Steffen Klassert <steffen.klassert@secunet.com> To: David Miller <davem@davemloft.net> CC: Herbert Xu <herbert@gondor.apana.org.au>, Steffen Klassert <steffen.klassert@secunet.com>, <netdev@vger.kernel.org> Subject: pull request (net): ipsec 2016-09-08 Date: Thu, 8 Sep 2016 08:29:09 +0200 Message-ID: <1473316155-12186-1-git-send-email-steffen.klassert@secunet.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.182.7.102] X-G-Data-MailSecurity-for-Exchange-SpamLevel: 0 X-G-Data-MailSecurity-for-Exchange-SpamFilter: 0; 1; str=0001.0A0C0208.57D10542.0152,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-G-Data-MailSecurity-for-Exchange-State: 0 X-G-Data-MailSecurity-for-Exchange-Error: 0 X-G-Data-MailSecurity-for-Exchange-Sender: 32 X-G-Data-MailSecurity-for-Exchange-Server: d65e63f7-5c15-413f-8f63-c0d707471c93 X-EXCLAIMER-MD-CONFIG: 2c86f778-e09b-4440-8b15-867914633a10 X-G-Data-MailSecurity-for-Exchange-Guid: 4817748D-6DA4-4185-9348-5BA86C9BB35B Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
1) Fix a crash when xfrm_dump_sa returns an error. From Vegard Nossum. 2) Remove some incorrect WARN() on normal error handling. From Vegard Nossum. 3) Ignore socket policies when rebuilding hash tables, socket policies are not inserted into the hash tables. From Tobias Brunner. 4) Initialize and check tunnel pointers properly before we use it. From Alexey Kodanev. 5) Fix l3mdev oif setting on xfrm dst lookups. From David Ahern. Please pull or let me know if there are problems. Thanks! The following changes since commit 8e6ce7ebeb34f0992f56de078c3744fb383657fa: net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata (2016-07-16 22:06:00 -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 11d7a0bb95eaaba1741bb24a7c3c169c82f09c7b: xfrm: Only add l3mdev oif to dst lookups (2016-08-22 06:33:32 +0200) ---------------------------------------------------------------- Alexey Kodanev (1): net/xfrm_input: fix possible NULL deref of tunnel.ip6->parms.i_key David Ahern (1): xfrm: Only add l3mdev oif to dst lookups Tobias Brunner (1): xfrm: Ignore socket policies when rebuilding hash tables Vegard Nossum (3): xfrm: fix crash in XFRM_MSG_GETSA netlink handler xfrm: get rid of incorrect WARN xfrm: get rid of another incorrect WARN net/ipv4/xfrm4_policy.c | 2 +- net/ipv6/xfrm6_input.c | 1 + net/ipv6/xfrm6_policy.c | 2 +- net/xfrm/xfrm_input.c | 14 +++++++------- net/xfrm/xfrm_policy.c | 4 ++++ net/xfrm/xfrm_user.c | 13 ++++--------- 6 files changed, 18 insertions(+), 18 deletions(-)