Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4677381iob; Sun, 8 May 2022 21:38:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtIVtGOlNlSQf50hDZdso/ZiQsAOHeBtXKnVpwq0jY/NzLCnFz8lZRC5XwGLnzQSwhAoEq X-Received: by 2002:a05:6a00:228c:b0:50e:17ba:9f84 with SMTP id f12-20020a056a00228c00b0050e17ba9f84mr14082991pfe.62.1652071133417; Sun, 08 May 2022 21:38:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652071133; cv=none; d=google.com; s=arc-20160816; b=O7rmlfOhpnpb7Jn3Dy9cBm4sd8EKsfH/iI0OiH/ZB0Ak7Jsh5iejmvLH5vVzyQNhPy AuT4ysmK39/nexbVII6PoEPJ2X/3mk5k1R8s9S/RczXibsGcL9xvXZGuJSFBDaFbVH+D xQ0pW1Y27rE7JAr/zYAMUDMF4nYMon8w1hMmwngCfGPZaUBlwu8EEpp4ZdaF33zGKAaE QhDwP61wNtPypZMCTnzymKY9+XhIY6jFNqGL6ctwS0DqG1SqePcIBBPNLIYWcAZQLmHW MR2tXvnniDxSphVFFEaEo7Z14yIKNCTPjfhEfZTCbSmZWuM0DfLCyI68xsdkx9vsZlYV 2tog== 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=HD+tQOd40xpZGYvRpvCDVA7QsHbmkTSCAqjc625nYF8=; b=zdGsFKgUsY53+wSQXNYu5cdeHLV1gsQizvfKo0pDkAb8Yj4+Ji+gZ8v+5IXv+BU4z3 BxyHrcpJhpOdzFjoIEpqrWKkILxocxFg/4UPDSqBVS3ECxvF4wUoxPJ0Y2Io/oAe3D6O C2w7IUPcXtRpme5QODqw6ohihm161XJ0/HeFK1R28zFcHfHnHUYnlh5G0M69wl/Ansc3 Os67pHkCIaoTcHwiiob/OlIjAvSbCj2IMsafg10oUnlDiCiDbh7VwfZXjHKAc/3KiPma 48m1H71pytg60hUWBWl1h1BwuCpnqpVFO38gGU2i4Z06Hfg5yinekof41GyK6VpF3vK5 gtwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QUwCwVu1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id g18-20020a056a00079200b0050bb3e9c4f7si11781451pfu.134.2022.05.08.21.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 21:38:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QUwCwVu1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0DA111258A9; Sun, 8 May 2022 21:38:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376927AbiEDRp2 (ORCPT + 99 others); Wed, 4 May 2022 13:45:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355910AbiEDRMb (ORCPT ); Wed, 4 May 2022 13:12:31 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E4174BFD2; Wed, 4 May 2022 09:57:54 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id F1245B82795; Wed, 4 May 2022 16:57:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9EA7C385A5; Wed, 4 May 2022 16:57:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683460; bh=0iMNgaBjHtLS3t6I6ylp1+Pz9b/WoZlybeTCOb/kz44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QUwCwVu1MGx29cqZYbcnBZAvVhN0y30drRtLJjgxzjxvAhj9SvpNsrar0GueoOrxn qi6GJHi3475+XK6ev9vafsiUNNmhwBdPVipwPull5kRVTdQx/4biTqU1HNVUfP0cse gPyGs1jCUrq/kc2ExzveWAp+FsWrnY/BqQSXrKWE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peilin Ye , William Tu , "David S. Miller" , Sasha Levin Subject: [PATCH 5.17 122/225] ip6_gre: Make o_seqno start from 0 in native mode Date: Wed, 4 May 2022 18:46:00 +0200 Message-Id: <20220504153121.344531416@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peilin Ye [ Upstream commit fde98ae91f79cab4e020f40c35ed23cbdc59661c ] For IP6GRE and IP6GRETAP devices, currently o_seqno starts from 1 in native mode. According to RFC 2890 2.2., "The first datagram is sent with a sequence number of 0." Fix it. It is worth mentioning that o_seqno already starts from 0 in collect_md mode, see the "if (tunnel->parms.collect_md)" clause in __gre6_xmit(), where tunnel->o_seqno is passed to gre_build_header() before getting incremented. Fixes: c12b395a4664 ("gre: Support GRE over IPv6") Signed-off-by: Peilin Ye Acked-by: William Tu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv6/ip6_gre.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 976236736146..d9e4ac94eab4 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -724,6 +724,7 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb, { struct ip6_tnl *tunnel = netdev_priv(dev); __be16 protocol; + __be16 flags; if (dev->type == ARPHRD_ETHER) IPCB(skb)->flags = 0; @@ -739,7 +740,6 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb, if (tunnel->parms.collect_md) { struct ip_tunnel_info *tun_info; const struct ip_tunnel_key *key; - __be16 flags; int tun_hlen; tun_info = skb_tunnel_info_txcheck(skb); @@ -770,15 +770,14 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb, : 0); } else { - if (tunnel->parms.o_flags & TUNNEL_SEQ) - tunnel->o_seqno++; - if (skb_cow_head(skb, dev->needed_headroom ?: tunnel->hlen)) return -ENOMEM; - gre_build_header(skb, tunnel->tun_hlen, tunnel->parms.o_flags, + flags = tunnel->parms.o_flags; + + gre_build_header(skb, tunnel->tun_hlen, flags, protocol, tunnel->parms.o_key, - htonl(tunnel->o_seqno)); + (flags & TUNNEL_SEQ) ? htonl(tunnel->o_seqno++) : 0); } return ip6_tnl_xmit(skb, dev, dsfield, fl6, encap_limit, pmtu, -- 2.35.1