From nobody Wed Jan 03 17:50:06 2024 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 4T4y0v1X3yz56MXn; Wed, 3 Jan 2024 17:50:07 +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 4T4y0t6fSMz4rpg; Wed, 3 Jan 2024 17:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704304206; 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=HWFlpLyQCIXUSwHKhhuHn97b3ZFAksP0n8GTlws+5N4=; b=Mkmr5FhjudRt8SvKgBFemK/eTO1gAnQ4Tac8Bl5LpLpX7IGiEhrqZySyPD/CVu9RC+y6uS htZrq0YMLju+d1Q+3N7J2iETlflwvVbzyKwUFF6/P5Dm6kYUZagqI78rWPu1O/inZM66K3 3Wngx5NLEupI2OK8k9u/FShXbuIW/nsBa/MzljuNwjGm+RR1Us+XED2DAhlZYObK3ohUYl T4AUwOyly29yDTLRJVyR7ilFEOdrXO9RK6cy763XI89U2O4WO7qmMRH02w8s+e6uB1tIfp LKDi9cRMMeF0c0X28u38sFNvqhhW+lJeywCHLSzSll/3nStzdZxkxlN9mX39AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704304206; 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=HWFlpLyQCIXUSwHKhhuHn97b3ZFAksP0n8GTlws+5N4=; b=GxXfBw4KaAQubaMQl5YkSFVLQ5PYvQNbyHBbzigYc3nK2Y0Bnpd/3kYhb7rqSLCWSRgg+f rjZr/RCFgF/fkN5FSoYnVflcDinyPeoRVtUi+TPEKR9gRpmmKfmgc4m/NsaSPbc2omJoCR N9zQvNUXtFB7jnI6Bgj4iebV5EWwY6OrG68xJOBRTecaDRLjCEoduHOnF0KmdVyHvYUnrD Fdavccf+Xwh00J/ANCgpXaYBfgsh0qU+WBA6Jg0hO5XtuaTncDaZ50gsgZXc42OZD+Szxk ORvn2TPDtA265vHmrbWql4V4rQPw7uKqZCoI1h/pbBSnT/pO5sUb7i9BS2j82w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704304206; a=rsa-sha256; cv=none; b=FsPQZEBUdnT9OFpJH7RQi54mbYgWnfvwEvjirVSbFzDwqYwjPMIyGEtJrpnxzyVcF11I7j /+R0lmuOQ6akYdN4T+CYXPGnGxHbomW2UyQ0KO0ihWkKYlXwK5GCba4vzdSvQ/xgU/49s7 4NJHDPAdfZeK2FTCgyI7guzkZZVx4SdI0FC5hmvT8pLjgsv1rQ5FpgTmfaMP6AQp0sWUxZ ldmhMlIBulkb61mwHolBQ/7LDhq2XU1u5Aa5EV5qSIW700qQsU3bdrwGAuMI8+dNtUK4t6 bym08sR+D4J5bRD69gS72JEVkwbVYuGM+CseRU9w7fVXAsesGhj7sPV77vzD1w== 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 4T4y0t5mBMztWv; Wed, 3 Jan 2024 17:50:06 +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 403Ho6fr038079; Wed, 3 Jan 2024 17:50:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403Ho6sh038074; Wed, 3 Jan 2024 17:50:06 GMT (envelope-from git) Date: Wed, 3 Jan 2024 17:50:06 GMT Message-Id: <202401031750.403Ho6sh038074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2012748bd723 - stable/14 - pkg: Allocate a suitably-sized string for the local ABI 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2012748bd723d05e75de4519ae6eae0f40eba96a Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2012748bd723d05e75de4519ae6eae0f40eba96a commit 2012748bd723d05e75de4519ae6eae0f40eba96a Author: John Baldwin AuthorDate: 2023-11-16 00:53:53 +0000 Commit: John Baldwin CommitDate: 2024-01-03 17:43:48 +0000 pkg: Allocate a suitably-sized string for the local ABI Previously the local ABI string was written to an on-stack buffer and the pointer to that buffer was saved in a global before the function returned. This had two issues: c[ABI].val pointed to a no-longer-valid on-stack buffer after config_init returned, and the string could potentially be truncated. Fix both of those by changing pkg_get_myabi to return a pointer to a string allocated by asprintf. Note that the allocated string is left in the global config array until it is implicitly freed on process exit. Reported by: GCC 13 -Wdangling-pointer Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42623 (cherry picked from commit fd9ae9ac04edf9acef4a2ffbf663698a2b8e7ced) --- usr.sbin/pkg/config.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index a2b005eca835..ce3a11cf8c81 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -144,32 +144,35 @@ static struct config_entry c[] = { } }; -static int -pkg_get_myabi(char *dest, size_t sz) +static char * +pkg_get_myabi(void) { struct utsname uts; char machine_arch[255]; + char *abi; size_t len; int error; error = uname(&uts); if (error) - return (errno); + return (NULL); len = sizeof(machine_arch); error = sysctlbyname("hw.machine_arch", machine_arch, &len, NULL, 0); if (error) - return (errno); + return (NULL); machine_arch[len] = '\0'; /* * Use __FreeBSD_version rather than kernel version (uts.release) for * use in jails. This is equivalent to the value of uname -U. */ - snprintf(dest, sz, "%s:%d:%s", uts.sysname, __FreeBSD_version/100000, + error = asprintf(&abi, "%s:%d:%s", uts.sysname, __FreeBSD_version/100000, machine_arch); + if (error < 0) + return (NULL); - return (error); + return (abi); } static void @@ -453,10 +456,9 @@ config_init(const char *requested_repo) char *val; int i; const char *localbase; - char *env_list_item; + char *abi, *env_list_item; char confpath[MAXPATHLEN]; struct config_value *cv; - char abi[BUFSIZ]; for (i = 0; i < CONFIG_SIZE; i++) { val = getenv(c[i].key); @@ -512,7 +514,8 @@ config_init(const char *requested_repo) finalize: if (c[ABI].val == NULL && c[ABI].value == NULL) { - if (pkg_get_myabi(abi, BUFSIZ) != 0) + abi = pkg_get_myabi(); + if (abi == NULL) errx(EXIT_FAILURE, "Failed to determine the system " "ABI"); c[ABI].val = abi;