From nobody Sun Feb 06 15:26:00 2022 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 6029F19AA618; Sun, 6 Feb 2022 15:26:01 +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 4JsCls1MPSz3sqb; Sun, 6 Feb 2022 15:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644161161; 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=D7GLXQbFGQ47mnu/K9IR76WzWUc2d3XLam67DBMqsWU=; b=vKcDjYt4N2xnNusSsiOL9I2TeyaCCK/OR0kx+J9E1SQLA06KKhI+1MfvjC/G+Ow6hC5WA8 f2RnbiKuUbYwVGzGeqc4FUEVuZZT7LvxtwSlOvUS6W7C0tI2uFrKNHac+5UHyCtBewKfdh yqpAr3RP9YeTir8/y81ISgl1rCJDP1sK8ESHEoA2VQxfhKE1oPNdyprX9aiEDseKbZsthN dPgBjHE+6QDGdOf04hqMHtxbnbDCCA4WzMIZYyhI7bbiOK7rECO//VHX5L8wseax8PXprD JjissB1qCXORo8rIS+0aCChvm0mYXFOh0/VDKZ33vHj8Mh/Lj5L4M4lt45cRiQ== 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 05A0014BED; Sun, 6 Feb 2022 15:26:00 +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 216FQ0p3082669; Sun, 6 Feb 2022 15:26:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 216FQ0uH082668; Sun, 6 Feb 2022 15:26:00 GMT (envelope-from git) Date: Sun, 6 Feb 2022 15:26:00 GMT Message-Id: <202202061526.216FQ0uH082668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e17fede8ff46 - main - Fix too small sscanf output buffers in kbdmap 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e17fede8ff4629b5ff640ed660940b04c70da0b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644161161; 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=D7GLXQbFGQ47mnu/K9IR76WzWUc2d3XLam67DBMqsWU=; b=dQgT2lmoJ+heS/Si22ikGyW7UZOcW7c2epaizjiIM/aLYat0MLa3I6NwprDWd7aM4fOV+8 5f145mmgseRfh+yWGx5uSaGCN7OXW8ZbUnLpid7VFIiYwZqoR1EBzsA3NAbIMLI7zBPvzM ygCUe1t9RBwPDv8kK/tUCg7eAQAiGuCOFU5HeRNEVkI0CT50bCIh8HZKrihdYyXEQioDkX 1ujk9Fk2Ikjepm2XKJiA9MdvCSnysl1WtS/xNcJpfF4hcX7xY6maED2/rTyjTCNh1y8hne pA4PVPFMd1YI0BTj+5pyqq5qhENOPyiftmuxX+DQ9pdJt3Z4HLfeYYxIPt0RPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644161161; a=rsa-sha256; cv=none; b=P3Qkq62n8//X2rIOqXodh/CYhVDQ3eAVf6/eyMIV0KpP8vqfrKIoVR1NJqYLY6fKKy2L3J 9DMTErmCIJUkGj/Q8h4FG0/V/tu9O18dzNNchGZRRDSeFwgXasc9v4qpZWUac0eiQwZ+ro qufLfQt6dkwrYNmQUf2PVb1Md3y28cMqXLAfBqe9Pss6FbSzH5Dr5lPIX0lwbRm9Y6gK7W 3cbHsTko7MwuvAP2Cgj3pukIXFYIzv9bwPGHBIyBzmCEmU9pbzvt+T9FyXhztupxDSKc+9 ZOaMXLxwjonQxltqDkRbFCUaAvqlRYa3oqpCxVzfYjsvMk5i8aI+T+GSF6XF4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e17fede8ff4629b5ff640ed660940b04c70da0b6 commit e17fede8ff4629b5ff640ed660940b04c70da0b6 Author: Dimitry Andric AuthorDate: 2022-02-06 15:25:11 +0000 Commit: Dimitry Andric CommitDate: 2022-02-06 15:25:25 +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 --- 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 a11956b682ee..0702c1e66e94 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -225,7 +225,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"); @@ -566,7 +566,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;