From nobody Wed Apr 17 13:52:02 2024 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 4VKMlk2MSwz5GwSs; Wed, 17 Apr 2024 13:52:02 +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 4VKMlk1lyWz4pw1; Wed, 17 Apr 2024 13:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713361922; 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=3AAmTOBR6t6G1mEPZfGwB9N7dMnP+Qc9irnYD5+7JpU=; b=B8MRDS2cfFncSZcjgcCdHSt+/hv8qpQle0bmeOlzJmzV+VA1h8OMMJccuTilTrA4vGUB1v YsJ66T4EJpMGyTu1uc3SDeLvAqVt/hL6baDKjW1reAUPi4VHQ2GV986tEJRvk7saEnoObM ZOpmNq9puuMo/csQVDOuJnkyOtalCY3Q2Sdkkj0GTJCGfAOfBb078fu7MHQqGyQV5EfUp6 0I6fBDgszKbjtyvLjjR7690TemOHiuSu4SjhYIwkb4We2QMZsm/YQv2QGrtUHPlB/GfQ/5 4a0PF+lgR/gFAXywWY6xYHiTHxzoaRTsO0nUhcPvgEo53v1GKejb1rAONA4/sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713361922; a=rsa-sha256; cv=none; b=X9z7rh7MhL3hwmjVEuyozbfG4Bfm7EnGy+cFI5TfSLQTYPd4GHgKJwV1D/ZR2mueUZlUYk cHJydm/gLNojalNIKik/yu9WbiXWmk1+XGXqtHhv66yIgMM+1RTSZsunarABZB9vNYU6d1 gDiL3BTReAoHeDyYH7S3mALhMt1WoQXaPFCNZ2DzYiWXj7MAZOOoxvvVGB6FyUjg+pp2X3 66MX15TbzCsjJwdMFuA83oW18uYG/OvWtJkMkJ6qpHP1TzsqhFohpGU9bJQ20JODpwiPNL O948Mw/VOo/tKKZ+q/4QCOmOtEDr+auWrcpGQYeP39LZrj5foKliA+hAR2a4tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713361922; 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=3AAmTOBR6t6G1mEPZfGwB9N7dMnP+Qc9irnYD5+7JpU=; b=uqZTUJPUWG4r3WuHlYMRMH+In7KE6WUgIjmHIJMAcLy1dumq16mSntqmQR9qAspMWrOLfx jGHzrPI7u5lZ2EKfcyP9SFEahZ1BU8xqMU0PnGk2GYJ6j2PHWiR7Q7NoMtDPUtoCq2SPuH ow+JfLJUCCgsf93Fy60smR4SkC3g7mTauI3CPIef6WU+YPPEWDg0xOyDEwjURpc4iXkgoq V/pBvVaS5Dllpilc1ptLnTe5j2ymnnVRsMqCpUa2dnsA7Pk9nh9kl7YCLo8OS5xUGXOrwz p7eq2hxgKRAEEpiF+Y6IVzRi3uQZLJtANLof20tMzGubYthUxtiaMRwlLNlLNQ== 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 4VKMlk1KCszTr7; Wed, 17 Apr 2024 13:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43HDq2mE035511; Wed, 17 Apr 2024 13:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HDq2UI035508; Wed, 17 Apr 2024 13:52:02 GMT (envelope-from git) Date: Wed, 17 Apr 2024 13:52:02 GMT Message-Id: <202404171352.43HDq2UI035508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8375db082c6b - stable/14 - tcp hpts: improve consistency 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8375db082c6b486b05cd8072979d113512341fab Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8375db082c6b486b05cd8072979d113512341fab commit 8375db082c6b486b05cd8072979d113512341fab Author: Michael Tuexen AuthorDate: 2024-04-01 19:51:59 +0000 Commit: Michael Tuexen CommitDate: 2024-04-17 13:51:43 +0000 tcp hpts: improve consistency The target_slot argument of max_slots_available() can be NULL. Therefore, check for this in all places. Right now, all callers provide non-NULL pointer. Reported by: Coverity Scan CID: 1527732 Reviewed by: rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44527 (cherry picked from commit b600644fdd6cefb1b90d76fdd5aa595946611a7d) --- sys/netinet/tcp_hpts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 9d192b17c41a..89b9611e643f 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -758,7 +758,8 @@ max_slots_available(struct tcp_hpts_entry *hpts, uint32_t wheel_slot, uint32_t * * "0". */ counter_u64_add(combined_wheel_wrap, 1); - *target_slot = hpts->p_nxt_slot; + if (target_slot) + *target_slot = hpts->p_nxt_slot; return (0); } else { /*