Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3649405pxb; Mon, 24 Jan 2022 14:24:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+/qEJyBQtH+uyipM271WjWApjGHqxQBw2NZm4jtPNyRGd7LsKVBTAcRLpkj5ITI9rGY/X X-Received: by 2002:a63:be49:: with SMTP id g9mr13150741pgo.375.1643063082631; Mon, 24 Jan 2022 14:24:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643063082; cv=none; d=google.com; s=arc-20160816; b=Y4N0//YCr9dqIRAhEiOHRRYHg8MgH+Kg3hA1qebw346fuFJLe9I99qiLJv8Ledvk62 HLdWlx+mI4mdxv0L6ZQUy0Q2ptAeKSUVPCrleAlRA3/qB1GFFx9meXaIpyLNzafBzEey J1yjxOtXrwVFLsxqnZLKyXST0NMmmheuEzCipN+RFlt4rdPf63kUcE3+MH+3iAp4Qoas GTnIERQKs2Y+eiKJbNjZMIDvfJU1SKVj4jbqYEAbGcyL5HwNDxoaRLhDKSHuWlS+FW10 azQOc0h6YJU2pDTNNk6y0CI19PjfqoKolUxcBCJr71FfOVTJCbZkpcf8cr1Cc4SjWcr6 KwIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=O6WdcWJNmgPLQ/z3DTwpAf6SOuyd9j1nwqLd72ZtcZA=; b=SjRy1TapIRjFhbkcnhFdBGCWKmUELjtYmc1NzX8Nl5MUie/isRY35Vv+lhAWzbsEcv kaWzZ2UJZGhgn/62iAJ38tEqxKCY/k5xF21rwM0sl67h4kYs41euoEBaghNIGK8o0jJ8 Kjc1ykXUVSBcS9q0t7DTMMe/FAv1kijPF2BZ9CR+vY8FTGEINDbMedTdv6WYErp0TJHZ 8MyKGLLXxpT3BzXP+/UXyB2CBlZZiA5NLSO9bt61+OL8VU11tqwDpOabpvECv75448ED IY/fu9/eWryg2JqnyTWkfhBe5xzD0/Iw903BjcakUkCJCfGlpu7rXYaqTx2WLq7j5uQp 9Enw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Bj+w5kLZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b23si12809872pls.7.2022.01.24.14.24.30; Mon, 24 Jan 2022 14:24:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Bj+w5kLZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1583100AbiAXWQ3 (ORCPT + 99 others); Mon, 24 Jan 2022 17:16:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1390833AbiAXVM6 (ORCPT ); Mon, 24 Jan 2022 16:12:58 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22627C02980A; Mon, 24 Jan 2022 12:09:45 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B834F60916; Mon, 24 Jan 2022 20:09:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90CDEC340E5; Mon, 24 Jan 2022 20:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054984; bh=M8qBtgq4qnULWEmvL4y24IHRUUiDZqfTZBrg8l7jr4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bj+w5kLZbwakC5gbTVZfw5u8orir+1b2SCCwEMmRCuH+Z+HWzUmUDfOivk79xVqWU pt7vKeXEcPpmNybsroqteQxxc2P0/gTP2aura6PJBzmPs0AX1U9g9kKdOKM9+01Tl9 jUflmHXFt5QW8PtgxsbyTbq2xp1j6VZ+2Tng4WPI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guillaume Nault , Jakub Kicinski Subject: [PATCH 5.10 537/563] gre: Dont accidentally set RTO_ONLINK in gre_fill_metadata_dst() Date: Mon, 24 Jan 2022 19:45:02 +0100 Message-Id: <20220124184043.010103713@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guillaume Nault commit f7716b318568b22fbf0e3be99279a979e217cf71 upstream. Mask the ECN bits before initialising ->flowi4_tos. The tunnel key may have the last ECN bit set, which will interfere with the route lookup process as ip_route_output_key_hash() interpretes this bit specially (to restrict the route scope). Found by code inspection, compile tested only. Fixes: 962924fa2b7a ("ip_gre: Refactor collect metatdata mode tunnel xmit to ip_md_tunnel_xmit") Signed-off-by: Guillaume Nault Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_gre.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -599,8 +599,9 @@ static int gre_fill_metadata_dst(struct key = &info->key; ip_tunnel_init_flow(&fl4, IPPROTO_GRE, key->u.ipv4.dst, key->u.ipv4.src, - tunnel_id_to_key32(key->tun_id), key->tos, 0, - skb->mark, skb_get_hash(skb)); + tunnel_id_to_key32(key->tun_id), + key->tos & ~INET_ECN_MASK, 0, skb->mark, + skb_get_hash(skb)); rt = ip_route_output_key(dev_net(dev), &fl4); if (IS_ERR(rt)) return PTR_ERR(rt);