From nobody Wed Feb 9 17:28:46 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 8D5D119B5F10; Wed, 9 Feb 2022 17:28:47 +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 4Jv6L72RgSz3NTx; Wed, 9 Feb 2022 17:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644427727; 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=ud4kajCD54VUJuJn5mUfFgqwmD8Dv0FULiHhyIXZv78=; b=yMrb124ctfzNMV77F+e8H9rRmGuYCYPsd6txFMgoI01t5757MXQfxeFQUmKTFn2uAWlUVB sxGbbMXtHaFvPkyJGrhCFBSCYUHLBNBSLav1aC2HjnwORuMzwm70hW2J3yi4tn7CiltixO /4Wpauc6Zmqnd2dqORMVjcy/SpzSxM4HG2OqWRikbs7KKD4PxXgm+d5y8wTkUoOwbxaeCx LVI6peK6GBJ8LmhFYfN0Qy/PDzq8qnHZ3K6k6Yibh5zvPUCsYxX5UEfg8QFdCHW+3jDEli Dozybchu68cs/Gax6W6000A0y0YEs5Q8KPv52+dUHKJTh0v5DaPwY7RKENmJ7A== 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 00B6011449; Wed, 9 Feb 2022 17:28:46 +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 219HSkle019202; Wed, 9 Feb 2022 17:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219HSkjs019201; Wed, 9 Feb 2022 17:28:46 GMT (envelope-from git) Date: Wed, 9 Feb 2022 17:28:46 GMT Message-Id: <202202091728.219HSkjs019201@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: 596a057b862f - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 596a057b862fdebe244288a73620dfa3d9bb9ce9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644427727; 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=ud4kajCD54VUJuJn5mUfFgqwmD8Dv0FULiHhyIXZv78=; b=MyVOz0kdtTjcXZRkR2RfokWWyp7RcA2RMiqtsHsMOhC2F9Ktcf6nCzJQ2sIavgu7WTzITA 3ghR5RotnvDbl1HDKdsOMCMubLsfAs95muXw3/XS7ZS0B8NsByX1v1xgMF3Xo0vyjRgjq6 iaqVGeHq/ZRN0n9UowLOYdiA6aPbWdHULofFW3iUKuAdz/6LySNVFDLyU4wlmCamjsiLO6 CD5mIA8/hHVzu3Csl8ezWAnDw+oWjybb7uc5pR5GPEVRnpkimF5Vm636AyXc1QETtruRXX 297RP23lPkM07G/KiZ0pMaiOymucf8zHJwg9uKTOsGrl6xpUIK1iiQ5I7hOEMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644427727; a=rsa-sha256; cv=none; b=tL7NHahl8Jc11ilBP1qGJJ1YtzBYuXpkG/7+Oddb2WQtcMQAOEDaHayon7F489SuUkqqwE eOMUq1uPbm/+P+g2cZ+d/Ny+v2BTuUBKli1vEsk52bLm4N3unGzaTpL90GBI/TwzAUQSS5 PuLV4PrtApq4qL+NfQ+MJYcm0mrECfO03xU1qlqKl7IAe7p1y1iGvC3Kc3arplBEFBp38B t89mzj+9dFhY7aLEXNeeB8c/kt0QsQaDyzCm9ci2Lmrt/ClYvqJZJENCwgoA/cShZC5J4E Lgp3ZGPtMkVMa86orMaSY1vBNKVfuswkHAFA4kejdQPQqEyEesvIY0qV+s16Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=596a057b862fdebe244288a73620dfa3d9bb9ce9 commit 596a057b862fdebe244288a73620dfa3d9bb9ce9 Author: Dimitry Andric AuthorDate: 2022-02-06 15:25:11 +0000 Commit: Dimitry Andric CommitDate: 2022-02-09 17:26:40 +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;