From nobody Sun Dec 24 14:03:53 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 4SyjSV07tbz54g7B; Sun, 24 Dec 2023 14:03:54 +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 4SyjST6XRnz4G2Q; Sun, 24 Dec 2023 14:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703426633; 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=xFWB5nl8GvzUcpFwhLT4W1P0QwVLtvx71TlPWUxay/4=; b=tz6qJXuNPuupNXYs7X8Oimht7pp3j1PANbdWwuGDX/ut6kUy/kW+BZ9wmqZwfFhiRccEGK PQ8oZ3g2EhquIX0s+MNZ/l94jrn33/el95DqGllbzTAb5xtQJR0plwo9Rhqd8QTOBv9eco SNLVuNdmQahAm5uMTUXPKIdYI2ZLuSk/xGRB75qBx+D/ruYCDAuaKyawg5lMzaogEJGpSA XCtPnKrLqKU0cfAIrbzTWDGXswdu9vLQUZT8RqbKDy0h9535VZ2sUn8m98A7gfiT+j02+2 6ntkesLx4n1hxCDzc7qyFNSXL4PdE71zXGbqHSTzIPllyegUKAhKaMaQfA16CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703426633; a=rsa-sha256; cv=none; b=MFvfuQ/t7GtuAABHYCX4McHAMGtvkJ7Gm0fzjF04BD6yXDvzxdvk3gxDZkyKRkF+Y+sm7p 7T3uKJeNjk5ps9iXMcTfUxv/ijmBDpZYuhAuORRbfQjvkrETHdLun9tB5uTpxntBBllWYM proeg00RegaUCXqUU7duD4N9jWiNJo0JcIL9Z0IF9NSQuXr73txOlTgA9rpVWpqqTrMU23 jLlIERXBtfqhdrACBNp4Y5RbvRIojLo0P+vgukyZVbM4NN3A1PrvVePSPgBgsg60zFxQzk 6Qy8xF34cJClgnuvue9lmBHjGo9G95AWuI6PKRZXTaegyPncjGSJNeqoK6gCjw== 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=1703426633; 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=xFWB5nl8GvzUcpFwhLT4W1P0QwVLtvx71TlPWUxay/4=; b=haqc9L7UJexKJQ2TaYt2Un271GNOhO6Phz1v4JVvGUutzQR/up5tCJUhRwlbJXBM5h0X65 zm6hBPeXmeD7zSeuaHXtQtvTrvGYnbwy1t+w3qaFy8lMhoB4cDxz2WvCN/Fa8AXcyWRLcI z5E2hROkpHu4D1qWRU3Hj02SEchpVEBMLRbcqQR5bjQVFx7SUQZZe5Y3QnqhCamZ+DVSIk w3dPiNdv0/yVcBfyOwgIB/7MOT2IuQNYvNwc3s+FcAofN8+JOcmV5Z4Z+XDZfygUbUJNIU hU3kJQrkqNVYq+/jVjmn5/UrQkJcZ3lGmR5oM6g5Y3H/c+mEo5McY3ghHw3cWg== 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 4SyjST5bC0zWSY; Sun, 24 Dec 2023 14:03:53 +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 3BOE3rEY057751; Sun, 24 Dec 2023 14:03:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BOE3rZP057748; Sun, 24 Dec 2023 14:03:53 GMT (envelope-from git) Date: Sun, 24 Dec 2023 14:03:53 GMT Message-Id: <202312241403.3BOE3rZP057748@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: 9734bad3611c - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 9734bad3611c291798727ae9020f876304d4e849 Auto-Submitted: auto-generated The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9734bad3611c291798727ae9020f876304d4e849 commit 9734bad3611c291798727ae9020f876304d4e849 Author: Dimitry Andric AuthorDate: 2023-12-21 22:35:17 +0000 Commit: Dimitry Andric CommitDate: 2023-12-24 14:01:35 +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 b6b2432ef3ec..a98dad499c7b 100644 --- a/contrib/telnet/telnet/telnet.c +++ b/contrib/telnet/telnet/telnet.c @@ -208,7 +208,7 @@ unsigned char ComPortBaudRate[256]; void DoBaudRate(char *arg) { - char *temp, temp2[10]; + char *temp, temp2[11]; int i; uint32_t baudrate;