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=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 21B52C43381 for ; Sat, 16 Mar 2019 08:43:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCBFA218E0 for ; Sat, 16 Mar 2019 08:43:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="MBwLjJh+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726798AbfCPInf (ORCPT ); Sat, 16 Mar 2019 04:43:35 -0400 Received: from kadath.azazel.net ([81.187.231.250]:33114 "EHLO kadath.azazel.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726689AbfCPInf (ORCPT ); Sat, 16 Mar 2019 04:43:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=zHZvUmtgru+dgFTcc/bXxF0SH+hBPYRf31OcbKR5PIk=; b=MBwLjJh+891VBvX2/2hiiiBavU rUbYt7pdBjqob43a4Mffb008IcE38F9kjC4Tqt+S+BZXLSfkxgydmyTqkiDRbrsCGsWgvg905qj3Q sBTHxCvur+hIuW0mhnaPbMu4cp3eCfNJdCNzga3UuAwxE2iTSnIRkfeyx+NTzi0R+5kg+mg5GxfT7 pcs88SXEFJE4Gznf6ks6/Ov2LEYTmrby+vpllyuj/o4CoUoIeUMIhUkmO0hyv7dym2FurWO5zMOdj xLYIsCl0j5J3AH6+efMdugZxKMh4gBsLnbbCZO+UDjPM3H3sscH70NXhkyDA1KoSPcVYuG+xfznyA vJ6rnNfw==; Received: from ulthar.dreamlands ([192.168.96.2]) by kadath.azazel.net with esmtp (Exim 4.89) (envelope-from ) id 1h54uf-0000Vp-IR; Sat, 16 Mar 2019 08:43:29 +0000 From: Jeremy Sowden To: netdev@vger.kernel.org Cc: Steffen Klassert , Herbert Xu , "David S. Miller" Subject: [PATCH net v2 1/2] vti4: ipip tunnel deregistration fixes. Date: Sat, 16 Mar 2019 08:43:28 +0000 Message-Id: <20190316084329.31801-2-jeremy@azazel.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190316084329.31801-1-jeremy@azazel.net> References: <20190316084329.31801-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 192.168.96.2 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If tunnel registration failed during module initialization, the module would fail to deregister the IPPROTO_COMP protocol and would attempt to deregister the tunnel. The tunnel was not deregistered during module-exit. Fixes: d9ee3444014e ("vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel") Signed-off-by: Jeremy Sowden --- net/ipv4/ip_vti.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 68a21bf75dd0..b6235ca09fa5 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -659,9 +659,9 @@ static int __init vti_init(void) return err; rtnl_link_failed: - xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP); -xfrm_tunnel_failed: xfrm4_tunnel_deregister(&ipip_handler, AF_INET); +xfrm_tunnel_failed: + xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP); xfrm_proto_comp_failed: xfrm4_protocol_deregister(&vti_ah4_protocol, IPPROTO_AH); xfrm_proto_ah_failed: @@ -676,6 +676,7 @@ static int __init vti_init(void) static void __exit vti_fini(void) { rtnl_link_unregister(&vti_link_ops); + xfrm4_tunnel_deregister(&ipip_handler, AF_INET); xfrm4_protocol_deregister(&vti_ipcomp4_protocol, IPPROTO_COMP); xfrm4_protocol_deregister(&vti_ah4_protocol, IPPROTO_AH); xfrm4_protocol_deregister(&vti_esp4_protocol, IPPROTO_ESP); -- 2.20.1