Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3663289pxb; Mon, 24 Jan 2022 14:47:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJzE++Q1H4YwbAAsVefl9UNEbRs41kgJUmDJRdAQ1lAl9V3deVdMf2rPKrIkFwV7FcfJufpC X-Received: by 2002:a17:902:b414:b0:149:61c7:d550 with SMTP id x20-20020a170902b41400b0014961c7d550mr16047054plr.129.1643064446613; Mon, 24 Jan 2022 14:47:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643064446; cv=none; d=google.com; s=arc-20160816; b=P4Sc1HMWPk0rLwB+i6MJxKbj6ZZUZDIUrhyh9Opt59GG2ngZ78Ot/u2YOnQ6Lgdqms JXL65aXd0tFp7A0CtWHaG+othJAVSiCn+JhN/pu8NU72JBriDoaLx4n+qLss8YgqPE3V o1to6CGFmZtBWtK3qxXM2VnhtV4tKrH91/Dj9LGJNQBIwS2VxzRKvyNWjaylWmKLmIq3 +1zeB4it7H4a1vN/gWo39Jc99JtlOuTiqGF++5yiUHiILXdfMe0xzeuQ6IKZ6REyDEuG 7uFnG5XWZd6zrUid9GvneltrlJ9GzHA3vdw7JzyfqjGoFTTX93/GhBmZdQS1+9xFH9gu g/GQ== 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=RmvvBplK9xTelUryQcH62xWPtJ9/buz+WuP+gUAOzXI=; b=V30Lge8DTgUnBdo047qQPaDGl9tj6y5si1wRKINUNF6A4gbLiWlhpdXF1Zle4ER1ct TZowGbxTEDw19I9MfoPCcAHGKjAUU3jYqHjJk7PzF03z0gu8nXR/iLbR7ZSOzGlM8dWI hKVxZyH4ctPzeJE5e3W+gZR5jaX7p7VbZ0xW/vZcNuCs3puUm9Ykje5vekSB3o1n0PH7 mlQLovrqttB190V55bedXbw5gV5A+heZb0BpSiE50xWta4lmen5Z6ualcwtV9GxHVm0i ieDMo7uUBNHji5lqMD+Ey9UvJ12OUsrjdONSImbXRwAqvhXhTCQtcUiJJsKNgwq5bfxG lhYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NER9Q1pA; 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 ie22si481298pjb.147.2022.01.24.14.47.13; Mon, 24 Jan 2022 14:47:26 -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=NER9Q1pA; 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 S1382397AbiAXWo0 (ORCPT + 99 others); Mon, 24 Jan 2022 17:44:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1456648AbiAXVjm (ORCPT ); Mon, 24 Jan 2022 16:39:42 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EBFFC0612B2; Mon, 24 Jan 2022 12:25:35 -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 ams.source.kernel.org (Postfix) with ESMTPS id C6D70B81218; Mon, 24 Jan 2022 20:25:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E40B4C340E5; Mon, 24 Jan 2022 20:25:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643055933; bh=BC1+ohOdjdL/J3gRyFgi1xGqVWIQJqSuhzaq4JqVPig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NER9Q1pA/Dp2sLiVc7l/uz1+SaC69xOpvqCDJ3tD4MGYd5ORkh09lPxDCJ4Tyi5Tr /yOcBwIO+ao+UGDrDuOBDYUHZdSfukFxDEa/OLokSRlVvy16BbREC56R/KeAFA/bdM 1yysM6yPtx+CWUU6yDFxYNpHvIqyJZF6WAFSy1BM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , Sasha Levin , Steffen Weinreich Subject: [PATCH 5.15 314/846] netfilter: nft_payload: do not update layer 4 checksum when mangling fragments Date: Mon, 24 Jan 2022 19:37:11 +0100 Message-Id: <20220124184111.745474124@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@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: Pablo Neira Ayuso [ Upstream commit 4e1860a3863707e8177329c006d10f9e37e097a8 ] IP fragments do not come with the transport header, hence skip bogus layer 4 checksum updates. Fixes: 1814096980bb ("netfilter: nft_payload: layer 4 checksum adjustment for pseudoheader fields") Reported-and-tested-by: Steffen Weinreich Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_payload.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c index a44b14f6c0dc0..132875cd7fff2 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c @@ -502,6 +502,9 @@ static int nft_payload_l4csum_offset(const struct nft_pktinfo *pkt, struct sk_buff *skb, unsigned int *l4csum_offset) { + if (pkt->fragoff) + return -1; + switch (pkt->tprot) { case IPPROTO_TCP: *l4csum_offset = offsetof(struct tcphdr, check); -- 2.34.1