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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 6E5E1C04E84 for ; Thu, 16 May 2019 11:41:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 380672089E for ; Thu, 16 May 2019 11:41:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558006915; bh=8MsImvtU1gRSs0NVlfx8A4FJNZB6PbUtLhXooho/O2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PJYzh6UCtC+uqjeKXN2RPH/wjRduItYa7PtkPz+EX+Em1C7VnILu4vrSYSYyzr9PU J7OXj4vy11KGiwg1P5uYzgDv3AqHCiVUp7Mwp1v2bXGFuCRoGSZc0AslMQXNyK4S8t leKdhyuf89C3o4x/dqs8zoJ00TUPF1dNwqR376zk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728398AbfEPLly (ORCPT ); Thu, 16 May 2019 07:41:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:50678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728353AbfEPLlv (ORCPT ); Thu, 16 May 2019 07:41:51 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76EAA2087E; Thu, 16 May 2019 11:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558006911; bh=8MsImvtU1gRSs0NVlfx8A4FJNZB6PbUtLhXooho/O2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FnEqtWurPkWK4vgXkDNlcatenn9lp+6ggFAllWZuAYFthCmNpNmkbwu1wuSvQF0Tw XAsgge+/WG/AmX6X2QcewlUEbjOsLek+alNZUh1NjNyLsnzqWLr79uvwu0Y0RjQuTP 0N+7Be/8PYcjCK4niaZVoLBrYt/49Ky1kOD09tcE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeremy Sowden , Steffen Klassert , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 3/8] vti4: ipip tunnel deregistration fixes. Date: Thu, 16 May 2019 07:41:41 -0400 Message-Id: <20190516114146.9267-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190516114146.9267-1-sashal@kernel.org> References: <20190516114146.9267-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Sowden [ Upstream commit 5483844c3fc18474de29f5d6733003526e0a9f78 ] 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: dd9ee3444014e ("vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel") Signed-off-by: Jeremy Sowden Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- 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 fcf327ebd1345..bbcbbc1cc2cc6 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -648,9 +648,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: @@ -666,6 +666,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