Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3630763pxb; Mon, 24 Jan 2022 13:58:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzf2344/ZyfK34pYbaGKoBwKfWU4QJQSxzzECk67/UUgwYMJwUffpcr4du5sSxTc09IotPZ X-Received: by 2002:a05:6a00:2487:b0:4bc:315d:21f4 with SMTP id c7-20020a056a00248700b004bc315d21f4mr15376634pfv.55.1643061491067; Mon, 24 Jan 2022 13:58:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643061491; cv=none; d=google.com; s=arc-20160816; b=N1nxwEb3iWe1XL0RQ5bUXVpKSZypuHlyFapkbYMsOycKfQ60zpJEZ3LH2rcBbHovl5 BspFlgnv/oG/C4TUhJ6gw59f4FMWiIYCVeUiMGy34BgCoumGuaaOOFxMXUePi7nIgSvV K8fdpyxt4U7TVV9SBu5JtPXIE1RIz5zRkGeItSX4TS4Ah9cSBlECvKGnU4DKjIKu5/JD xbHv2RPvyRtmF5o+zci232sGQimQZDWfda8Henj6Xb4mW3odxFUJrlHIi6htkQAxkADO fI9GvbfDKv3aq49v+U0lUhSe5fH5GW53H8todxcDPVdvCLnPkNO3uABR0f+ehmBKySom oVHA== 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=4hjb78vJVozSlWC+g+fGH+3kn4+K1K9oIEUWoGF22bQ=; b=0L8cRd0zegRHDMnwLF/FNQf0kYgLUQqaNE5Zlu7vahnq8mD5Bo4qRVrV4fd6GzCoDv tejasPzbLKDIOahYrHl3w8qDVrxptHjV0bW4UKRrYHu/Y16LTLJ4aCVUQjnYAZwv0a5G gizo4hAITzIpacXIGPKBnmBvv/CqZIVvDeAiB9rb63dVVXw7M62CG3nmtAnRKX5wZn1b Qyz/fifA5/B7QgJcRB2Yt4EpH0KUZIoql0UwMYvbHM3GHwXhXAuFZwS5PW/zXs8UuNyw JDcLINOzrJIy+zN1HJR5B+95kY3LeI8zl8PvNcwdaK/Uz8wvSHXAlSjq6qoz1enyZVcm vpWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZK5JmYtm; 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 u21si15918795plq.602.2022.01.24.13.57.59; Mon, 24 Jan 2022 13:58:11 -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=ZK5JmYtm; 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 S1446212AbiAXVqB (ORCPT + 99 others); Mon, 24 Jan 2022 16:46:01 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:35284 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1448046AbiAXVLz (ORCPT ); Mon, 24 Jan 2022 16:11:55 -0500 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 3ADD861451; Mon, 24 Jan 2022 21:11:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 132CDC340E5; Mon, 24 Jan 2022 21:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643058714; bh=tZoRqKshpb0jYNvvz3638yINcJjRi1Ic87BJvrzDhSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZK5JmYtm34pamy+HKlwb9Bep+hRqSn46QRoQ3cSy0sYQUit3PnLQ1sS99egt1n4Yw Fz/v5NY4QMUctYMJ8fLy5TFfPMbjBfO6Vse3TVvldECtXNYC4FgpmY7FW/IEf5JRTP 8SJJW1xGYjV+qFU1/qPTzpiWnv9AmawboRiOqXoE= 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.16 0379/1039] netfilter: nft_payload: do not update layer 4 checksum when mangling fragments Date: Mon, 24 Jan 2022 19:36:08 +0100 Message-Id: <20220124184138.051803190@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@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 bd689938a2e0c..58e96a0fe0b4c 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c @@ -546,6 +546,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