From nobody Thu Aug 1 20:27:46 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 4WZgWQ72p1z5RPQ2;
Thu, 01 Aug 2024 20:27:46 +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 "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4WZgWQ6TyXz4Jfy;
Thu, 1 Aug 2024 20:27:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1722544066;
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=KmujPb6JfKT5k2reTYdTZNX2kcqmhpQUYcZQ1tGCFYA=;
b=JqgR3IhXDI+W1M30MjuZtZe8MQ080l9JcC6OG1JnPHZ6NPDwBFhxSDhIIYGuWBz+hyaq4A
SoZhbwZnAByCtXgagZEzLXf+/6+/p2BN+rn7otM7cuWx649cEn+Zl+o4slK9cStW0QU4VT
cVu07gJsI3k1zYt6reLqvYsIqbAWNnus/QyPFlYz9KYLdaqaYJPpAJynrBIwpdV+lhOB4b
ASE18MfI/r64DJG+pG6ikuBN536MNThy8InfrqIKEgGnC+YsyjC4ELMFhstFOtT8TzTcmz
r7Y8Wmt/VI3zKFL6Dw6iq3btF1yTcX0WiFjtIjiWYA8rg8jckoNPe46yebKTDA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722544066; a=rsa-sha256; cv=none;
b=K9VSM/wCCW7ajI6DtyomoWS/MbGk5Q4A+ZXLKusvkbaSXMZ65ZPTVemju35T5vOfJPQ/n4
38rgh4KOihuSBjX7j2XgfrH240GkVK3BSvVKuEPwVuQy8KYJRI6yFDvGa2Fs2UB+mUpftm
EliE1AsaCy/7afqDleTIIf/rQ/l1Kq+p9zSO1s25cB2qkKLU8BBEEwZYJx/N7LRWfKPDAm
3X/ueodQkVYRWHWYdXFoa0WcFdAyD9TWOarESm6VypCSdRs1Tud9KaJJxbJaw/DcJkzmRc
rP2Up8xqMJXmE7DkAyZp8+HwzURDdQVMAd3YIGStuShnR07IstWR4R8xl+uzZw==
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=1722544066;
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=KmujPb6JfKT5k2reTYdTZNX2kcqmhpQUYcZQ1tGCFYA=;
b=vm6VLDWoGdVC2GPVk9qxAmTitDzyrIcZCzZ9mQmsylbNUjhIUK2UX9PdoC6KhecXzbHtV8
5xOS38B7dri7A+BFKzKbeBpSEIDIFfGWUKQ6nxR8XQWkV2GS0FBIsc9PVxPHJpBiPr5O1O
Ls3TIZfJcMxmG2raAA8fiZrGU13GfdTR4DcWXmiG2Rr+8TllCAsOXkb62gb0Y1MHvP940Q
h/WA9CimVRzEGgbWGdsOEcZAuFuy9kc+g68PINQNRa7GBTNoQOjybJTYrfglWu5jF/Ga5f
oSKZRQo5jiZOYjiETN/k78kM4sJt1IuESQKFUcAWy39zZEXb4KU/i+fUDlZWvA==
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 4WZgWQ5ysTz10G3;
Thu, 1 Aug 2024 20:27:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471KRkns020935;
Thu, 1 Aug 2024 20:27:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471KRk5t020932;
Thu, 1 Aug 2024 20:27:46 GMT
(envelope-from git)
Date: Thu, 1 Aug 2024 20:27:46 GMT
Message-Id: <202408012027.471KRk5t020932@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: bbd1d17ff339 - stable/13 - tcp bblog: use correct
length
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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/13
X-Git-Reftype: branch
X-Git-Commit: bbd1d17ff339f43159f79fce9bd68a85520b81a7
Auto-Submitted: auto-generated
The branch stable/13 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=bbd1d17ff339f43159f79fce9bd68a85520b81a7
commit bbd1d17ff339f43159f79fce9bd68a85520b81a7
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-03-27 13:31:48 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-08-01 20:27:09 +0000
tcp bblog: use correct length
The length of tldl_reason is TCP_LOG_REASON_LEN, not TCP_LOG_ID_LEN.
No functional change intended.
Reported by: Coverity Scan
CID: 1418074
CID: 1418276
Reviewed by: glebius, rscheff
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D44510
(cherry picked from commit ed505f893ab08aa61e2a1046ae54df357a108260)
---
sys/netinet/tcp_log_buf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c
index 27b587f6ec9a..f51adf09391a 100644
--- a/sys/netinet/tcp_log_buf.c
+++ b/sys/netinet/tcp_log_buf.c
@@ -2234,7 +2234,7 @@ tcp_log_dump_tp_logbuf(struct tcpcb *tp, char *reason, int how, bool force)
if (reason != NULL)
strlcpy(entry->tldl_reason, reason, TCP_LOG_REASON_LEN);
else
- strlcpy(entry->tldl_reason, "UNKNOWN", TCP_LOG_ID_LEN);
+ strlcpy(entry->tldl_reason, "UNKNOWN", TCP_LOG_REASON_LEN);
entry->tldl_ie = inp->inp_inc.inc_ie;
if (inp->inp_inc.inc_flags & INC_ISIPV6)
entry->tldl_af = AF_INET6;
@@ -2324,7 +2324,7 @@ tcp_log_dump_node_logbuf(struct tcp_log_id_node *tln, char *reason, int how)
if (reason != NULL)
strlcpy(entry->tldl_reason, reason, TCP_LOG_REASON_LEN);
else
- strlcpy(entry->tldl_reason, "UNKNOWN", TCP_LOG_ID_LEN);
+ strlcpy(entry->tldl_reason, "UNKNOWN", TCP_LOG_REASON_LEN);
entry->tldl_ie = tln->tln_ie;
entry->tldl_entries = tln->tln_entries;
entry->tldl_count = tln->tln_count;