From nobody Wed Feb 09 17:28:45 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 62BAA19B5F0C; Wed, 9 Feb 2022 17:28:46 +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 4Jv6L56hnrz3NTl; Wed, 9 Feb 2022 17:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644427726; 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=Q6VUjWOyDZlUf0/E/55cbLhszFNCooaK/rr3d6OQfug=; b=rQG+d0hvGwuT+4iDuT3mcC+/J6djP5iTrIVs8UPGWCd91kPaI6SqereTEgBX6ZJY3AIrLG QACRjRKItinZNvdfYWTy2K838iPVHe3nTJXd0z9xpRqc/MesiUL45NStJ/ELe/o18Q4cki nu64pRPka3B/T+4Q4qPsLU8oSHHYe/KLHZ9kcCZKWto3CtkGyf0+dcmntfxWn++LlhMvhd VHTHv1QRkWki6DnrMbI7b6JsV/GkKrh6joMYsizK7Y5S5Q+EYicySRniXkuaHkfwp7OsX3 /7vszcOV30K7tGzSJIV9UHIRCkeJN01kWEDsp3HsRk4LpoOAXfiTSblr3uGOxA== 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 C504611686; Wed, 9 Feb 2022 17:28:45 +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 219HSjPt019178; Wed, 9 Feb 2022 17:28:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219HSj2H019177; Wed, 9 Feb 2022 17:28:45 GMT (envelope-from git) Date: Wed, 9 Feb 2022 17:28:45 GMT Message-Id: <202202091728.219HSj2H019177@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: 4eebfbf0740c - stable/12 - Fix too small hostname buffer in bootparamd 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: 4eebfbf0740cf337cc21d08367b57e047fb7b8d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644427726; 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=Q6VUjWOyDZlUf0/E/55cbLhszFNCooaK/rr3d6OQfug=; b=wpRR7IvUiYtZXxv/2XYFSiy40Nh2uhaIA1gDNL8Q4kqXrKtqK/Ao/4kQKaTobRd3YYanJV eMKTK+ujKlunSGSyjiuDGwg4XHVQlWXgUnBsKEHLwi0HkJKwwYfL7tC+eYY7/Qh1aQymEo ZMFaHQuDnLSaiyUZfa998m8x86uW5o/quF981Qb9N3Su43DCnMvN4U9lE0XVmSxb9kVaBi ur/TEWCsiGfQEBHwauK//IXb+G5t+ulybNxvT+VvJKbJfrpxUHlN8XCUI2cME4qd0t1szO vfybZJvZhqxYV6UdKoEeszlqf8X6bVYjdZP2RSD2RSdUffThNqArSSlwLB4DFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644427726; a=rsa-sha256; cv=none; b=s1/nD7wM1JTZ5rF9lz0h+bbqhAlM2u0dNCIklBlSqf0c3bdjsTT8kzaI+82MEA6DHixagv KIW2gbuj9rcXefpVKuUY3b6DiAAeEJoq4MLKBvy8eCDQXNGMWIrgh+y26yJHoR46XZRj1L tgdgVdiA84IhqwjAbWfRoJaMYQzx5SCQNvutNlIjgb+RtCg7j+XerprBf/yxrp2TWvdUZI OeK5hKHB6RkFyHG5qScVKCXWvxTKe0mAIgHWnrl8UCCPfonnwo7r7OpkqyxzgLP7iQjmMX kMZ8zQNo1E3qv1ba7QZlhCkgMkOBWGrmxXLJX2JKWg+304Ii+3nHxFZSqIrFlg== 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=4eebfbf0740cf337cc21d08367b57e047fb7b8d6 commit 4eebfbf0740cf337cc21d08367b57e047fb7b8d6 Author: Dimitry Andric AuthorDate: 2022-02-06 14:25:22 +0000 Commit: Dimitry Andric CommitDate: 2022-02-09 17:26:37 +0000 Fix too small hostname buffer in bootparamd This fixes the following warning from clang 14: usr.sbin/bootparamd/bootparamd/bootparamd.c:204:32: error: 'fscanf' may overflow; destination buffer in argument 3 has size 255, but the corresponding specifier may require size 256 [-Werror,-Wfortify-source] The MAX_MACHINE_NAME macro indicates the maximum number of bytes in a machine name, but it does not include the NUL terminator required for scanf. MFC after: 3 days (cherry picked from commit d310bf3867b4168e57365196c3a31797c0538097) --- usr.sbin/bootparamd/bootparamd/bootparamd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c index be885de62f55..5bbd5b4becef 100644 --- a/usr.sbin/bootparamd/bootparamd/bootparamd.c +++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c @@ -34,7 +34,7 @@ extern const char *bootpfile; static struct hostent *he; static char buffer[MAXLEN]; -static char hostname[MAX_MACHINE_NAME]; +static char hostname[MAX_MACHINE_NAME + 1]; static char askname[MAX_MACHINE_NAME]; static char path[MAX_PATH_LEN]; static char domain_name[MAX_MACHINE_NAME];