From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D48BC282C0 for ; Fri, 25 Jan 2019 07:44:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6717E218DE for ; Fri, 25 Jan 2019 07:44:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728740AbfAYHow (ORCPT ); Fri, 25 Jan 2019 02:44:52 -0500 Received: from a.mx.secunet.com ([62.96.220.36]:58718 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727264AbfAYHoc (ORCPT ); Fri, 25 Jan 2019 02:44:32 -0500 Received: from localhost (localhost [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id 6BDD2202C1; Fri, 25 Jan 2019 08:44:30 +0100 (CET) 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 ESMTP id 9FlVqSjN4WaP; Fri, 25 Jan 2019 08:44:30 +0100 (CET) Received: from mail-essen-01.secunet.de (mail-essen-01.secunet.de [10.53.40.204]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a.mx.secunet.com (Postfix) with ESMTPS id B3987202B6; Fri, 25 Jan 2019 08:44:29 +0100 (CET) Received: from gauss2.secunet.de (10.182.7.193) by mail-essen-01.secunet.de (10.53.40.204) with Microsoft SMTP Server id 14.3.435.0; Fri, 25 Jan 2019 08:44:29 +0100 Received: by gauss2.secunet.de (Postfix, from userid 1000) id 298833180213; Fri, 25 Jan 2019 08:44:29 +0100 (CET) From: Steffen Klassert To: David Miller CC: Herbert Xu , Steffen Klassert , Subject: pull request (net): ipsec 2019-01-25 Date: Fri, 25 Jan 2019 08:44:16 +0100 Message-ID: <20190125074426.31053-1-steffen.klassert@secunet.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-G-Data-MailSecurity-for-Exchange-State: 0 X-G-Data-MailSecurity-for-Exchange-Error: 0 X-G-Data-MailSecurity-for-Exchange-Sender: 23 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: C60B265E-79C5-49F7-B7C0-B10FF69D9B3F X-G-Data-MailSecurity-for-Exchange-ProcessedOnRouted: True Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 1) Several patches to fix the fallout from the recent tree based policy lookup work. From Florian Westphal. 2) Fix VTI for IPCOMP for 'not compressed' IPCOMP packets. We need an extra IPIP handler to process these packets correctly. From Su Yanjun. 3) Fix validation of template and selector families for MODE_ROUTEOPTIMIZATION with ipv4-in-ipv6 packets. This can lead to a stack-out-of-bounds because flowi4 struct is treated as flowi6 struct. Fix from Florian Westphal. 4) Restore the default behaviour of the xfrm set-mark in the output path. This was changed accidentally when mark setting was extended to the input path. From Benedict Wong. Please pull or let me know if there are problems. Thanks! The following changes since commit d972f3dce8d161e2142da0ab1ef25df00e2f21a9: packet: Do not leak dev refcounts on error exit (2019-01-08 21:41:40 -0500) 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 e2612cd496e7b465711d219ea6118893d7253f52: xfrm: Make set-mark default behavior backward compatible (2019-01-16 13:10:55 +0100) ---------------------------------------------------------------- Benedict Wong (1): xfrm: Make set-mark default behavior backward compatible Florian Westphal (8): selftests: xfrm: add block rules with adjacent/overlapping subnets xfrm: policy: use hlist rcu variants on inexact insert, part 2 xfrm: policy: increment xfrm_hash_generation on hash rebuild xfrm: policy: delete inexact policies from inexact list on hash rebuild xfrm: policy: fix reinsertion on node merge selftests: xfrm: alter htresh to trigger move of policies to hash table xfrm: policy: fix infinite loop when merging src-nodes xfrm: refine validation of template and selector families Su Yanjun (1): vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel net/ipv4/ip_vti.c | 50 ++++++++++ net/xfrm/xfrm_policy.c | 63 ++++++------ net/xfrm/xfrm_user.c | 13 ++- tools/testing/selftests/net/xfrm_policy.sh | 153 ++++++++++++++++++++++++----- 4 files changed, 223 insertions(+), 56 deletions(-)