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,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 7B2EBC2D0F3 for ; Wed, 1 Apr 2020 16:34:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 214572063A for ; Wed, 1 Apr 2020 16:34:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758861; bh=9HvRMlPLWQXs4FpMy3P+plJZyfjER2lQo6K0C2wNxTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IcIjtgEV524pLodYR+JYyVo2MCQrRNFpysFD/2s1vKHychLZB2mDxAliwQEjhsrE8 w6tmPem+Axr1rO5/UQv2PtBmRQOCC678O1qjom1WL6motYns8HU/8yDo0HmVF3QB2r aNztFQz2ETj8oLjUGg//IL6+xPVZ2j/L/+JpA4bE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388237AbgDAQeT (ORCPT ); Wed, 1 Apr 2020 12:34:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:32772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732660AbgDAQeS (ORCPT ); Wed, 1 Apr 2020 12:34:18 -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 522942063A; Wed, 1 Apr 2020 16:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758857; bh=9HvRMlPLWQXs4FpMy3P+plJZyfjER2lQo6K0C2wNxTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=00IKZGNNPyU+ysje+dxGEzDf5jmFcnJ+lNCaLxHY0vtQ8hP4DrKtnYe6+LN7kGY4x inK5SH+rHrJXMGM12jzaxSMFgC+ulfcBZbW1uwvFKulK+hd1Lux2+F/djE67G1pmgL hcjJTS70M6zotj2StCouazjOO4JkMJ1gIU2IxbnU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Torsten Hilbrich , Nicolas Dichtel , Steffen Klassert Subject: [PATCH 4.4 65/91] vti6: Fix memory leak of skb if input policy check fails Date: Wed, 1 Apr 2020 18:18:01 +0200 Message-Id: <20200401161535.217486213@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161512.917494101@linuxfoundation.org> References: <20200401161512.917494101@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: Torsten Hilbrich commit 2a9de3af21aa8c31cd68b0b39330d69f8c1e59df upstream. The vti6_rcv function performs some tests on the retrieved tunnel including checking the IP protocol, the XFRM input policy, the source and destination address. In all but one places the skb is released in the error case. When the input policy check fails the network packet is leaked. Using the same goto-label discard in this case to fix this problem. Fixes: ed1efb2aefbb ("ipv6: Add support for IPsec virtual tunnel interfaces") Signed-off-by: Torsten Hilbrich Reviewed-by: Nicolas Dichtel Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/ipv6/ip6_vti.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -315,7 +315,7 @@ static int vti6_rcv(struct sk_buff *skb) if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) { rcu_read_unlock(); - return 0; + goto discard; } if (!ip6_tnl_rcv_ctl(t, &ipv6h->daddr, &ipv6h->saddr)) {