From nobody Wed Jan 19 14:23:48 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 609D71971EA5; Wed, 19 Jan 2022 14:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jf7DP1h1Xz3PSM; Wed, 19 Jan 2022 14:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SuQXKvGWd9xoUrCGWLXYqgF9R80JXNelUcrQv78Dd00=; b=uQ0Q4xpnX5FxYUamklW+m+4lngDmoR95XsLclG8ZCUxTlf7EY5tKyfXuhyTvPGvxFMt3t5 yDQpZdw17e2P5spClDTPlFCdLdLnRxpf4uzs4a1mjUhcRBZkIHLgDqQn2fOOGEI8X+rcX+ jNNjZFZDsfQetu+5fDZNRVsSl8wGYMWtawhlJRVdIyF8xQzzf/g/IiOf7h3TNRqigIFDOc gRPk19jCmm6lxuRc/zEwcmieZSgdYJGcDbG+8+Jq0riqRYZBqTgIH/NpY8LzvwbqK9VcTn EvqkGM7LHRdAurSZfheeqa/umckGwyoxvz9I9WZ63NQnyGwpxVctr0hZ77a9Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1694F161D2; Wed, 19 Jan 2022 14:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20JENmR6010640; Wed, 19 Jan 2022 14:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JENmFv010639; Wed, 19 Jan 2022 14:23:48 GMT (envelope-from git) Date: Wed, 19 Jan 2022 14:23:48 GMT Message-Id: <202201191423.20JENmFv010639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2e9e8fc320fc - stable/12 - ipfilter: Fix IP header checksums post ftp proxy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2e9e8fc320fca3b4a8207c72111e596f1b67a764 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SuQXKvGWd9xoUrCGWLXYqgF9R80JXNelUcrQv78Dd00=; b=RUMc+KiyHSelool/AgJ5iv6J0eUV1TH9rZ6Q+cppIP3XcR+tteJ3b4ygbl065TJSWudgkZ lVpE00+Oorc0zQBg3HwPGY955LdRK+rkD9lnQiWHpJUG8HTiAhB1E4GNse28VDBfK3bAEu DE0MDJsNI6QVbLaaEmmmi+PJH9FtxXobpPTSbIOaELCE8U8ZwOCGSksZa2gWaplWnpMRsw tUKjBxUzyF+aFRGys2OkPKXuZedvf67PHOEpEJ1bYi8pF98q6VygA4iC24hELNCMtJQnYs N0O0m618ORVTT3S/RALiJ4dZguhAYWe+KuHzxm9nUFggPMA5xA5TKP33P0bdUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642602229; a=rsa-sha256; cv=none; b=C9/NX3S0DXk4clSAjlHq+B4tXFFSnWsBcxrIqftITknb07Apg7NG5rZb0sIaa5Ux2uDQEe V67KrzP8g3Bd2RS32gEAIHtxkjW+uGuy9hVnH7RDstszpmL+wsCjDo96wHEPMLqbDByLPV 0JrJr9rcOVlDJ5NvkpKu3zipkxAjrxC603cvWenrrbe8W6D/hkSnbRcrkLvUTmcnRxEnAi RPgcYkVr7c9dL7N071oYVez9cHaV2F+a0WxPiMcl2UIO4kjGc/DTEDTLhvehsGtl+RJXnm knWJkcbZOc0kmI7cOP32PPLl5mRYbKTzEsC10GhKEIAiqNSkRyTX3MSQYdji0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2e9e8fc320fca3b4a8207c72111e596f1b67a764 commit 2e9e8fc320fca3b4a8207c72111e596f1b67a764 Author: Cy Schubert AuthorDate: 2022-01-12 20:55:11 +0000 Commit: Cy Schubert CommitDate: 2022-01-19 14:23:16 +0000 ipfilter: Fix IP header checksums post ftp proxy Don't assume checksums will be calculated later in fastforward. (cherry picked from commit 2a6465245fa3f5323c2036049a730e2f2b95d270) --- sys/contrib/ipfilter/netinet/ip_proxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c index af5ed81a5765..52991723b25b 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.c +++ b/sys/contrib/ipfilter/netinet/ip_proxy.c @@ -914,7 +914,7 @@ ipf_proxy_check(fin, nat) ip_t *ip; short rv; int err; -#if !defined(_KERNEL) || SOLARIS +#if !defined(_KERNEL) || SOLARIS || defined(__FreeBSD__) u_32_t s1, s2, sd; #endif @@ -1006,7 +1006,7 @@ ipf_proxy_check(fin, nat) * packet. */ adjlen = APR_INC(err); -#if !defined(_KERNEL) || SOLARIS +#if !defined(_KERNEL) || SOLARIS || defined(__FreeBSD__) s1 = LONG_SUM(fin->fin_plen - adjlen); s2 = LONG_SUM(fin->fin_plen); CALC_SUMD(s1, s2, sd);