From nobody Fri Dec 03 04:13:05 2021 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 B0A3818C6515; Fri, 3 Dec 2021 04:13:06 +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 4J4zvQ1RZtz3D1s; Fri, 3 Dec 2021 04:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 05D381ADD; Fri, 3 Dec 2021 04:13:06 +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 1B34D5IJ029770; Fri, 3 Dec 2021 04:13:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B34D5ws029769; Fri, 3 Dec 2021 04:13:05 GMT (envelope-from git) Date: Fri, 3 Dec 2021 04:13:05 GMT Message-Id: <202112030413.1B34D5ws029769@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: bd1d0850452e - main - udp_multi_input(): the UDP header is only needed for probes 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: bd1d0850452ecd0bfa6a2ae4cd9938d302a59758 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638504786; 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=vOq5y0uamgSJMGwS4g8m8Xwtr6Vl5NVzdh08hxIg6u8=; b=BF4ocwnbojgEJ/lP6hvc03Qh3mPdoHjLbXtytvgQSbBWzU63QlsPZvaEJXY4hF1LGHi64U WgoJjbbycrjAdTqYZfIIwUhCiIuPDXafg2j7lGHVAv2+jxmpC71/9SncxxqJb/cEmr2A1w exHVu1gGACMOxThtmq2s+0kd91JYVeiMnizz5sQuIBuE8S1eLGKOgoAnY93jh4zfRi6fco Vt+JL5Fjqtc6yFnDpt7i90jB0DVRX5d9EaVTEBw//5aSusxbMhbpDi0D/6eR3UA4ziLLo2 3JSFzlCUoDehDCV8ffzgviQk1tsQXob1MCwe8mNqUHPrUK7ouXuWH9cswmudng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638504786; a=rsa-sha256; cv=none; b=uXBCDpuoGxu57oNxJneHkbCMX7ad9oiKNsE55p8kV00fkiCPMy5s8AjfdZHUFYrZGUbSd2 dApKg+77pqRKBrKFplpGHufPdACRp4wHs9Nm6vlRJ4j2SR0Wa7ZeMqzluqws40DW32hDk7 DUvzaNDEg5qVqMSVI7YG81cWMLRgmKUft6KTc5SulnNS3eebPg9VkXVaEE90GAh1jue79f lFMRqChCGbgOsPGNee95MOdzwIiAeZweenAHaYV8lRb55h006JQ8dMX0485mOmx3/Zd7Vj 48lPaZUTX0zHNOC51spuaB313Ls4bdWUiwcL1Fv7oAKxxY0f2TTO2RZGPDBgsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=bd1d0850452ecd0bfa6a2ae4cd9938d302a59758 commit bd1d0850452ecd0bfa6a2ae4cd9938d302a59758 Author: Gleb Smirnoff AuthorDate: 2021-12-03 04:12:40 +0000 Commit: Gleb Smirnoff CommitDate: 2021-12-03 04:12:40 +0000 udp_multi_input(): the UDP header is only needed for probes Reported by: kib Fixes: de2d47842e88 --- sys/netinet/udp_usrreq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index cd21b8640441..a6be949286b8 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -421,7 +421,9 @@ udp_multi_input(struct mbuf *m, int proto, struct sockaddr_in *udp_in) struct ip *ip = mtod(m, struct ip *); struct inpcb_iterator inpi = INP_ITERATOR(udp_get_inpcbinfo(proto), INPLOOKUP_RLOCKPCB, udp_multi_match, ip); +#ifdef KDTRACE_HOOKS struct udphdr *uh = (struct udphdr *)(ip + 1); +#endif struct inpcb *inp; struct mbuf *n; int appends = 0;