Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4785060iob; Mon, 9 May 2022 01:19:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwS3p9GeBLkf2h3esbDM91HH1vTvPaQtyXhaQ8wnyABZN4zcckG/KxvcM4WMU+e14C0THxX X-Received: by 2002:a17:90b:1d11:b0:1dc:5dd1:b50e with SMTP id on17-20020a17090b1d1100b001dc5dd1b50emr24719182pjb.218.1652084386796; Mon, 09 May 2022 01:19:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652084386; cv=none; d=google.com; s=arc-20160816; b=pWelI776/kyciNOygZajAQ1lBeU5LzOj0loPwoaCfMphQQua2q75gCcqEyGLS0GojK Pz/o2ZFanZMQHAmnGktwkHkfAXdeWgr4Knyh4NR4bBa/2YE04NP8e5Ndhuk6ZSUsiRYY XW6J9K2aciJB/ZWRfxDJNUz1gb0ebEiZ2W+XEQSyr/Y7JSmWjmoCQoeN5J8CKYzLYQaD augBCZomhQIdeJmDXqvBNN2sFydVEKdN+QIBB8GayyAoy0XVo4yuPG6nJdTAR+il20LF WDjA/5UpIybXqGVrTdVkhyiPBV775fK+l3Tx8UbwvAtP5zhfP2lpQ/yPmHvzter8UsCd BIeA== 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=rEeXyTBOsshPaFEfMrquwiQtG44j+iZWLWocUflPXkg=; b=VaL+0CS7D6dZHimQZijw1WpZff41OA90iAb4uu7mUVRW4XC0eisCOQTRXOwmqR3M1I fsiLjaV1zLHHxtBRecUjZEesxU4p550urc4497pq1YmGTp5Ejym9Qtc/bmfkiojUmTK0 nd+EfD/FPhGn1LN3uyDMPTehycqc+ciXSKiZlD8RnFlmtJZoP9eDSVf2qRYUHpmotzz+ 5Ksc8J0Fl5Rbba5qowK8IgtYspKU7epKgaKqn7g/iFnvK2irbobHLYh/hiZrrmTM7bGv 68P3K67BlBrU+vEjAKNJhi6tNMbyAam9TOE9LgoOxWQiE0lucKuQCDrifaFZ8uRU+Fzb YNyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hHD4Gxcy; 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 e5-20020a17090301c500b00156a80ba52esi12379935plh.274.2022.05.09.01.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 01:19:46 -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=hHD4Gxcy; 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 3ADF91D8B75; Mon, 9 May 2022 01:07:47 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359008AbiEDRn3 (ORCPT + 99 others); Wed, 4 May 2022 13:43:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355038AbiEDRLf (ORCPT ); Wed, 4 May 2022 13:11:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A13E4B845; Wed, 4 May 2022 09:57:36 -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 D2655B827A3; Wed, 4 May 2022 16:57:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CCCDC385A4; Wed, 4 May 2022 16:57:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683454; bh=uNDN8A8qsXZol7TTIOtlrkvOZ9SMvxddG+IitYyh9TY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hHD4GxcyXiTgSz/4w15AFC6QR5mSyYgFDLrHZegkvw72N6ZWMqGNGlVSDqFWkYoav +Wz4WPwdqlobyDBUbCda7SjxbAO2yUwP7PGirlhuMOcHzVP1cTIsmvgJlERNDDEIS6 mCw/2e/Ny/kBzHhkvQDn5ls05tDc6bYUAGAWoo6w= 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 121/225] ip_gre: Make o_seqno start from 0 in native mode Date: Wed, 4 May 2022 18:45:59 +0200 Message-Id: <20220504153121.269949239@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 ff827beb706ed719c766acf36449801ded0c17fc ] For GRE and GRETAP 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 gre_fb_xmit(), where tunnel->o_seqno is passed to gre_build_header() before getting incremented. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Peilin Ye Acked-by: William Tu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/ip_gre.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 99db2e41ed10..ca70b92e80d9 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -459,14 +459,12 @@ static void __gre_xmit(struct sk_buff *skb, struct net_device *dev, __be16 proto) { struct ip_tunnel *tunnel = netdev_priv(dev); - - if (tunnel->parms.o_flags & TUNNEL_SEQ) - tunnel->o_seqno++; + __be16 flags = tunnel->parms.o_flags; /* Push GRE header. */ gre_build_header(skb, tunnel->tun_hlen, - tunnel->parms.o_flags, proto, tunnel->parms.o_key, - htonl(tunnel->o_seqno)); + flags, proto, tunnel->parms.o_key, + (flags & TUNNEL_SEQ) ? htonl(tunnel->o_seqno++) : 0); ip_tunnel_xmit(skb, dev, tnl_params, tnl_params->protocol); } -- 2.35.1