From nobody Tue Mar 28 01:37:46 2023 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 4Plskg0xlbz42NVh; Tue, 28 Mar 2023 01:37:47 +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 4Plskg0QzCz4Hp5; Tue, 28 Mar 2023 01:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679967467; 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=dxpiJpw7QQAD5nF7y5aPunuIDzm5vjK1r/hxPl3cvAI=; b=h8eDUX51+Tx/W1ry2Pyk5hMxIuLAtOCIeYwPJEOrtpLAsroC5UpKdov8j+3ksUjp8iiaOf jXEjtQffnwGOV94bGNHNWohFNBZj9a1J1HREJWeM2IkMnsrbFJqnrLFl9kIQoMOKJRvkjo 2t6Se8HdQUUDFvqAB1lqJqOMYKcpPTHCmLDbq+phG96C65Oh7tC7yjN2Epfp6ax+MUrzJD +kN3UcVnDMcpz6se2/vxAjI9bmxUz9NW06+sY/+5lAwPGSN/mceDmoH2LqR/7RCCoAjqFc Jb5RJgFElYwMUWvcXwXTJXUP2dkcUXJIjgS4qlFdpjtFRZLMS4xexwXt6LHtNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679967467; 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=dxpiJpw7QQAD5nF7y5aPunuIDzm5vjK1r/hxPl3cvAI=; b=tfUz3YiqRxMlxt0Wnsirayb5KZ+iyXwqenc1285m2se+fMI9uWPQEDXJRRhdTVICJF+u2c DobDv/3RpurUaF0UfksVQrVXz1L3pxi03CW4fgZspmNrT2JKB3MgNI8STbvzc3DAEJgoH/ RN5tf3bUOwSGLlYrO8cVqf7uRyU6QopVWnoq+k9chCi+TkK0JoMjvkLnkATyn5KKeKseKb qOKwTZzEzCW8VIJTWUe2DIS+uwnLdvFYY2VuzaPVqNDAdDKrhFimdNxM6j/qyqiG7trQEv jDP5ZKUBW7a9UH/3/7tZqeaGJHr2BcMCgwupcyGkuUN8Ycj1TbpBlhyb/4YYjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679967467; a=rsa-sha256; cv=none; b=xLhFjWK2KZGiIR+PyotKu8Mn56CvmGsdWNEScEslRyGEQU3D05JuK6kJM3TmW+zBq86G5h hehyrKCA7dCduhiivYnMiZJAYCehlO7Bh5ATbrn5Mi6GpO9oJp7y5dMwvNwobzJTSAIQWw EB1+qw2wxHxkbqbe70gjoY/YwNawUmTfADTDZUOav9LkvQDmXfQ8XYN6JyPewtx62k4Mef bdiEHVM5F3fDEqkA1tU3NbLHGgWD2aXTS7dwAi8duKeHSC8v4CZM69nTFlQ9RlWSGrbyNL tUfjcKMmpA7XiklthMVwodrmxZOEVFSQU6bC6AKVclb7FVIkcs+UOA+0pyJToQ== 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 4Plskf6cDlzlNK; Tue, 28 Mar 2023 01:37:46 +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 32S1bkGe061236; Tue, 28 Mar 2023 01:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S1bkED061235; Tue, 28 Mar 2023 01:37:46 GMT (envelope-from git) Date: Tue, 28 Mar 2023 01:37:46 GMT Message-Id: <202303280137.32S1bkED061235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 78e6c3aacc7f - main - tcp: update error counter when dropping a packet due to bad source 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78e6c3aacc7fb9181a0fd77dc0bdf4b29e2f1d3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=78e6c3aacc7fb9181a0fd77dc0bdf4b29e2f1d3f commit 78e6c3aacc7fb9181a0fd77dc0bdf4b29e2f1d3f Author: Gleb Smirnoff AuthorDate: 2023-03-28 01:37:15 +0000 Commit: Gleb Smirnoff CommitDate: 2023-03-28 01:37:15 +0000 tcp: update error counter when dropping a packet due to bad source Use the same counter that ip_input()/ip6_input() use for bad destination address. For IPv6 this is already heavily abused ip6s_badscope, which needs to be split into several separate error counters. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D39234 --- sys/netinet/tcp_input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 992f8ea16e3d..6cf14f2f1f7f 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -675,7 +675,7 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) KASSERT(!IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_dst), ("%s: unspecified destination v6 address", __func__)); if (IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src)) { - /* XXX stat */ + IP6STAT_INC(ip6s_badscope); /* XXX */ goto drop; } iptos = IPV6_TRAFFIC_CLASS(ip6); @@ -745,7 +745,7 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) KASSERT(ip->ip_dst.s_addr != INADDR_ANY, ("%s: unspecified destination v4 address", __func__)); if (__predict_false(ip->ip_src.s_addr == INADDR_ANY)) { - /* XXX stat */ + IPSTAT_INC(ips_badaddr); goto drop; } }