Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2339447imm; Mon, 28 May 2018 06:20:45 -0700 (PDT) X-Google-Smtp-Source: AB8JxZojMIVX2lAuugfFb+IROFHUcR+PeesxjIFFLr20PsJAyawENOWOmWCH6XVc1wm47w4qoCuC X-Received: by 2002:a17:902:7883:: with SMTP id q3-v6mr13843950pll.71.1527513645113; Mon, 28 May 2018 06:20:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527513645; cv=none; d=google.com; s=arc-20160816; b=dBiucRcIlTTQrYgZtqxXek7iwC44ngi0XuUgEVGLaMnJTZiRUQGdqvfIQxjvW0/JYh 7MAQC1dn4fNy3R5ldJO7mFAb4l8greuryEne/ASjRBL6FfCjOokbJrbMtARSW4vLKGHX I5XDz3ivLG1f1TJmPtzqU4J0iqhPPzjhv+qmXxg3RFT+BqZjCxJWHWO63P5SGe3cBr02 Zc0wqujXC8wV+t7S4jzeUwDlruDUMmWW6K9HtYp2Sgc6fiMT+/HECB2hKf8+dnaeggOZ I9zfQmLdUFmyWSRfEmBoioXDoLfWRPxu1ttHiG3zeKcbzofyaPynDaTOFu97dCYb+A0M awpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=zLJrYbUspCVHfzxkHTOZTwo24xQ8yGVLFEd1oX/W2HI=; b=AgMvbz3HTE9TQGtISDKNQlroeRiEXc+3cXL707iy+NW/NP5/cZ73fcIInwG7vhiLnH +CODYaC6qlLcCcqTWx1CU/llBcSqocVtbgu6DggBlaJMg/FwYxT7auiTi4e4te24rkzu gfQBkyFbfAqsqt0x/eUWyp4uOlr9SbGmLXh6S6FlNLTdUvJMl1caCDgQyCn7Bc3jg2dr FRI64j1iZG0USQcN8qe7etKOwNaAGfgVg3hZ7bAMKiD7IHozfpyeCOOcXursuQFp771r GmQ3kGe+Oz6vF97BqBJT7T04SOvcA7n1yulqpJmW4rmpOicjlqJj87dge1ABnH4TnfU7 DxTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wbZY+k8y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z16-v6si29107464pfn.149.2018.05.28.06.20.30; Mon, 28 May 2018 06:20:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wbZY+k8y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1165292AbeE1NTv (ORCPT + 99 others); Mon, 28 May 2018 09:19:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:39240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163326AbeE1Kte (ORCPT ); Mon, 28 May 2018 06:49:34 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (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 B4AA520844; Mon, 28 May 2018 10:49:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527504573; bh=J0zd/avkIC3o2ZRE5Yp3oGKtH5uOgtaCATzIFQZWIVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wbZY+k8y2HoE7FkzgD4rhlFy9GrlzvcXVAGDORElXzpisj+csXxnXb8rExbD1dgSM 0QnuaR3yCmbOlIEftKULelX6BMxw8k5rmpeUHiXhwTD4Ju4Rv/89e8Kqhv55ggzY0Z 8HS6QC9WNV7mDhK3uEpC0zFQWMYDl+zYlFXbpWdo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steffen Klassert , Sasha Levin Subject: [PATCH 4.14 188/496] xfrm: Fix ESN sequence number handling for IPsec GSO packets. Date: Mon, 28 May 2018 11:59:33 +0200 Message-Id: <20180528100327.877774625@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steffen Klassert [ Upstream commit b8b549eec8187ac1b12075d69a2d84d89b5e811a ] When IPsec offloading was introduced, we accidentally incremented the sequence number counter on the xfrm_state by one packet too much in the ESN case. This leads to a sequence number gap of one packet after each GSO packet. Fix this by setting the sequence number to the correct value. Fixes: d7dbefc45cf5 ("xfrm: Add xfrm_replay_overflow functions for offloading") Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/xfrm/xfrm_replay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/xfrm/xfrm_replay.c +++ b/net/xfrm/xfrm_replay.c @@ -658,7 +658,7 @@ static int xfrm_replay_overflow_offload_ } else { XFRM_SKB_CB(skb)->seq.output.low = oseq + 1; XFRM_SKB_CB(skb)->seq.output.hi = oseq_hi; - xo->seq.low = oseq = oseq + 1; + xo->seq.low = oseq + 1; xo->seq.hi = oseq_hi; oseq += skb_shinfo(skb)->gso_segs; }