From nobody Wed Feb 09 17:27:01 2022 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 44DAD19B5258; Wed, 9 Feb 2022 17:27: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 4Jv6J60J7Sz3Mb7; Wed, 9 Feb 2022 17:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644427622; 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=1O486iN4MIajK0gASjKma7WkZiap+g+lGfqqYsxIunM=; b=MCfMnkqdyKCEl1PKCT4XhZHrlu11xlStJX31ZRyFTNwyV9Ys3SJZR13Q5ZGArlROVtKtKM xB2/+6crGH1BTNr+ZnYpET+MHmGcz3jBySYIfZQkWamJAaHxdiToSk84NfPtLZAD1aEZE5 beUDQJrIcREyosFfiZeJ+j8jgrWQnrvUbe/dGlqz8SufXAw1JHqw3xbwTH4EUIuH94vGyv IFMZNLtRkjAFxTahHCW7hjwvRZuDglxRT9RJ4gGc6g9R2JM4K3rPvvLgJGVJZp++LJp8rw hkDJP/MuecJcPrbbnupy5jGOMCU7fRC/PRor8ybqrU642+WTof17dtKJIXT6HA== 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 BC8C511349; Wed, 9 Feb 2022 17:27:01 +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 219HR1KK018901; Wed, 9 Feb 2022 17:27:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219HR1E5018900; Wed, 9 Feb 2022 17:27:01 GMT (envelope-from git) Date: Wed, 9 Feb 2022 17:27:01 GMT Message-Id: <202202091727.219HR1E5018900@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: 212c271999d9 - stable/13 - Fix too small sscanf output buffers in kbdmap 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/13 X-Git-Reftype: branch X-Git-Commit: 212c271999d9921ee056e32487d8502df385b0aa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644427622; 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=1O486iN4MIajK0gASjKma7WkZiap+g+lGfqqYsxIunM=; b=OXquJMVul2k9zjkDfuc1Fqci2fVdPufhgoOs6/g7yPM8Zm6hVS0eXCDUnzWbyNKo28FgrN Rivp97S9wKt2aWHKDggYlHgYXyNPTuPgjq2fivBE6Cm/oGOIM6iB4FpFzmq75a0Yd7DMy6 liyIsIz9MmL11VbK+ibQ+QshyqnEa8EZbmdmFpfZOwITtXTunru8rYftx0Ga1kAHrgfX6T 8ZnL57mLz7jqewdh/nm1qNcIwc6HSljp5W1NDGcs7z/YI9ue3ZKr1JBs4nY1Wn+BtSxbNl vJzV6IUYvqGvfjGrr/hVZS6OHhhshYgwuV8VqGtI0udNw6Ifg+DsNg6u5mwQpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644427622; a=rsa-sha256; cv=none; b=eYKQtWuJZy8gdzkg2k8rvDXYfNifvNTBfYHFQ5HHvnMKhwuIyGCmMOj1toj4eWzVF15kBT rBHeEk8A4mn3ZiuRXDEQPs4TQr/tcBVGmAJivMGFt4y3CEWlHJmeywCVfIR8o8zb9PbWSr QJF5jJ7rQoKNxEhqYPA2HLRV32jfMgXFjR5eXTIvjiD59dPKX1YSkbFm9LlT0pHj6ksraY gIueyJ6DKemfg8d9s+5pYdehMSEDAVG++zrn8t0Xf7djZvGtKYy+brVJCu2wTgRFvhd61J LkEGNepK6gmizY8kpXxf8XH7JZw5l7Uj6wajhw7UHGkKkiThkOtV2ib40pNXWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=212c271999d9921ee056e32487d8502df385b0aa commit 212c271999d9921ee056e32487d8502df385b0aa Author: Dimitry Andric AuthorDate: 2022-02-06 15:25:11 +0000 Commit: Dimitry Andric CommitDate: 2022-02-09 17:26:24 +0000 Fix too small sscanf output buffers in kbdmap This fixes the following warnings from clang 14: usr.sbin/kbdmap/kbdmap.c:241:16: error: 'sscanf' may overflow; destination buffer in argument 5 has size 20, but the corresponding specifier may require size 21 [-Werror,-Wfortify-source] &a, &b, buf); ^ usr.sbin/kbdmap/kbdmap.c:615:8: error: 'sscanf' may overflow; destination buffer in argument 3 has size 64, but the corresponding specifier may require size 65 [-Werror,-Wfortify-source] keym, lng, desc); ^ usr.sbin/kbdmap/kbdmap.c:615:14: error: 'sscanf' may overflow; destination buffer in argument 4 has size 64, but the corresponding specifier may require size 65 [-Werror,-Wfortify-source] keym, lng, desc); ^ usr.sbin/kbdmap/kbdmap.c:615:19: error: 'sscanf' may overflow; destination buffer in argument 5 has size 256, but the corresponding specifier may require size 257 [-Werror,-Wfortify-source] keym, lng, desc); ^ In each case, the buffer being sscanf'd into is one byte too small. MFC after: 3 days (cherry picked from commit e17fede8ff4629b5ff640ed660940b04c70da0b6) --- usr.sbin/kbdmap/kbdmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index 4f99ba03c2c8..f5d8a1e25e3c 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -224,7 +224,7 @@ get_extension(const char *name) static char * get_font(void) { - char line[256], buf[20]; + char line[256], buf[21]; char *fnt = NULL; FILE *fp = fopen(sysconfig, "r"); @@ -580,7 +580,7 @@ menu_read(void) char *p; int mark, num_keymaps, items, i; char buffer[256], filename[PATH_MAX]; - char keym[64], lng[64], desc[256]; + char keym[65], lng[65], desc[257]; char dialect[64], lang_abk[64]; struct keymap *km; struct keymap **km_sorted;