From nobody Sun Dec 24 14:02:12 2023 X-Original-To: dev-commits-src-branches@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 4SyjQY098wz54fcJ; Sun, 24 Dec 2023 14:02:13 +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 4SyjQX6KYhz4Cng; Sun, 24 Dec 2023 14:02:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703426532; 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=hfcDdtjc5vYndw9bO9rpG3lYwmeHDaOzHknxD9EPLx4=; b=p/XQwJ1TY1AH8A3g7dQU8Z4+BQeTc3Q0ogB/4hQ30a8hB0brR5PiTTCKsUhkrYXneBjXu4 qm6jMkBXdrtrhE/raAY1jj5rWmres6j0/7j5OehwceiZwmIErVjMZf2QwWJVCCuMaCFCKp Z0D45laE2bUN1Qnuh3D24YfTFTXPqyjefV8UTPuz/GZrrtibtMWChpapQCCyODfL0Afn2f Gc6eETNb8HD6IG9uJyUCZCICxhaS7WCdWf7W23NuCFdzdoqpTqvCppuLi984jqdsTj6mRL 0SRcNJyvMI4UISh6kZ4ucrX5CjHwu7P8eatAlVOpzZQszDAy3KPe5w54Eu5m4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703426532; a=rsa-sha256; cv=none; b=HuNzzvluy4jBgCaOjKugxkCkraPKt1it30gUrF9DHcZahJDsREKtZiztHyhqCZulFfgQHA aQD2ysxA9eA0zmatUtqCJNzyFJkH/hPJghIsNuCamj1rilw/TU9YIJa6BGQjshgov04hdw EKBmT/XqlCOkj8vJOqjk8Ifvw7myZOfsaP6Rx4QFNgTFzRlWf+kd6LzpQdzgt/6x4kUGXf Y4iUpfJTqZgWg1UKHOSdHBtdB7cJeg+AX+U2G5Ib4kKcGueRc7mPohOnjWBt5GH5puUjzF FbO9rJJUJ0w4qs/VFI6/X1hP0g0XUipvBrDohzjxsMRo/ltRuxBvav1dWZ55aQ== 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=1703426532; 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=hfcDdtjc5vYndw9bO9rpG3lYwmeHDaOzHknxD9EPLx4=; b=UxkZbz5MnZ9OSo8++LuSbrnc47S1jRex82IRw7KVGL/nq1rKTNCyeREOQD1j3GFkV6Dnsu ONEILnT8sTcpr4ZYo92I1me+v/U1kCSjxrhilJvUZsxsew8zcfkTPINiV7//7o5mOxjC7t usm3Ak0g8H24d1r7NelfLH18m69OZfi8NDO2p9HaKuJBu1eWxIFZEYNy5pWnCXxrqFeGb8 //IyHeIVQLxTbXpSix8mbM3Wl60aoDfNIZdNaFqlfJpa6rg28kHX0XWR4MVDYly5B+vhQ9 XEiw9oIKDOZNStk6Oxfgb5pMly3Nd4v2fionWgHPtoMEo6SnMD3BiHiTxZxvMw== 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 4SyjQX5R8hzWwL; Sun, 24 Dec 2023 14:02:12 +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 3BOE2CVs057100; Sun, 24 Dec 2023 14:02:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BOE2CgY057097; Sun, 24 Dec 2023 14:02:12 GMT (envelope-from git) Date: Sun, 24 Dec 2023 14:02:12 GMT Message-Id: <202312241402.3BOE2CgY057097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 60d9bb14e84d - stable/14 - Fix snprintf truncation in telnet List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60d9bb14e84d6462fd04260dcd660a8e585a62c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=60d9bb14e84d6462fd04260dcd660a8e585a62c7 commit 60d9bb14e84d6462fd04260dcd660a8e585a62c7 Author: Dimitry Andric AuthorDate: 2023-12-21 22:35:17 +0000 Commit: Dimitry Andric CommitDate: 2023-12-24 13:59:34 +0000 Fix snprintf truncation in telnet Building telnet with clang 18 results in the following warning: contrib/telnet/telnet/telnet.c:231:5: error: 'snprintf' will always be truncated; specified size is 10, but format string expands to at least 11 [-Werror,-Wformat-truncation] 231 | snprintf(temp2, sizeof(temp2), "%c%c%c%c....%c%c", IAC, SB, TELOPT_COMPORT, | ^ The temp2 buffer is 10 chars, while the format string also consists of 10 chars. Therefore, snprintf(3) will truncate the last character, 'SE' (end sub negotation) in this case. Bump the buffer to 11 chars to avoid truncation. MFC after: 3 days (cherry picked from commit c794d188222a4d3414233ff9630d47eedc090fbe) --- contrib/telnet/telnet/telnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/telnet/telnet/telnet.c b/contrib/telnet/telnet/telnet.c index a35ea40c4cd8..c936a85c9a23 100644 --- a/contrib/telnet/telnet/telnet.c +++ b/contrib/telnet/telnet/telnet.c @@ -206,7 +206,7 @@ unsigned char ComPortBaudRate[256]; void DoBaudRate(char *arg) { - char *temp, temp2[10]; + char *temp, temp2[11]; int i; uint32_t baudrate;