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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 C0CDCC433DF for ; Mon, 1 Jun 2020 18:57:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 997F4206C3 for ; Mon, 1 Jun 2020 18:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037836; bh=Uk2NQ6pJxx7STTg4V23cmfZP3VK2GGpnmgxbNTFcWxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0Nc4TFj1w3dJO249vIBEBHT7n1RYjKONcr5LVnZMAeT91nAyoX4EWod2Qk9BJPb0X huupXEP3qLh6YWN1W1LbA6lKYLWtVLadiYlLqzvxa/7KLLSsQ3AwGaKFzegUK9AnAw GOPHxb7e9KVllYVgpVg+UiAIUUt3wbscgCwmx890= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730664AbgFAS5P (ORCPT ); Mon, 1 Jun 2020 14:57:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:42710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729597AbgFASAF (ORCPT ); Mon, 1 Jun 2020 14:00:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EA0862073B; Mon, 1 Jun 2020 18:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034405; bh=Uk2NQ6pJxx7STTg4V23cmfZP3VK2GGpnmgxbNTFcWxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t3J9/gtmWat+vafMOy2h1/GPIkvcLccQLNqYOdrqob/C0LOpml0vLvMjctTbn+Bm8 ZLQTxK43PpbqSenYZS4t0/O4RgvjxrOlYQnySKo6WA7C81vXBr79YTewC7TAqV3nMg NH+ucr+8cGtmxgp1HXx7/OahhqbPYAv6oyQi4dGs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vadim Fedorenko , "David S. Miller" Subject: [PATCH 4.14 02/77] net: ipip: fix wrong address family in init error path Date: Mon, 1 Jun 2020 19:53:07 +0200 Message-Id: <20200601174016.919153810@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174016.396817032@linuxfoundation.org> References: <20200601174016.396817032@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vadim Fedorenko [ Upstream commit 57ebc8f08504f176eb0f25b3e0fde517dec61a4f ] In case of error with MPLS support the code is misusing AF_INET instead of AF_MPLS. Fixes: 1b69e7e6c4da ("ipip: support MPLS over IPv4") Signed-off-by: Vadim Fedorenko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ipip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -702,7 +702,7 @@ out: rtnl_link_failed: #if IS_ENABLED(CONFIG_MPLS) - xfrm4_tunnel_deregister(&mplsip_handler, AF_INET); + xfrm4_tunnel_deregister(&mplsip_handler, AF_MPLS); xfrm_tunnel_mplsip_failed: #endif