From nobody Thu Nov 16 00:54:50 2023 X-Original-To: dev-commits-src-main@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 4SW1lZ6RqVz50xQ9; Thu, 16 Nov 2023 00:54:50 +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 4SW1lZ5sTwz4FpZ; Thu, 16 Nov 2023 00:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700096090; 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=rA4iRH9anapwsnEEi2R3O2lKYCH2+U+tvilE3NVo+RI=; b=rY4iRO2baQEQ572GfkYQJ6f92mEH2C06/hmZFfuKtC4rgu2iAOX1PFV0N7nzN46g/2npwr XF7+9tSJL6KPKr5hq+dJr3pqvBmQTZxhWZXtKD83pG95MsObDNwLH1VtuHblTk5i//no90 biQO8hSmD+kRjGg11aLpsciEMQ+kGNH044tHD/Ne77AdR2UkKMI2wusRjOwK2yTGtAud50 /1yjfariQ1+2CFvKIlWjBlZhhI+bQjXCWt8mrqHCUJc7dwccw56lSMAre6sXasNWP2plr1 d/QfgCnrNCtFEQaicZZA/Wum9sMO3tkv04LT624frKD5KpCbM7BjCqYneP683Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700096090; 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=rA4iRH9anapwsnEEi2R3O2lKYCH2+U+tvilE3NVo+RI=; b=T4GESOUvUDD2dii2ELNsNnaPOY1IZAD8B2bNmul/btYTZ2XrgPHNPS9KHR5IdF+NWPx2YP ToERhFP61Ginrg5qQ5T0FR9/i5WzB+SkhUgf2VQ68ROI77V+6ERkK5fyxLDTl61WGho/mi 2Gf8x1VanRHD6Wuv4M5L8PXKWmK/ByMkXEhqLYhNk0DdlZAKrYw+yPKIhfbLWnM65QTVOE Cv+2Q7J2UEW1HkahR8QcwfaV4XzUoQJ51NrkROwc8GvTG/ci8YHQJfxMgjDPNpyIB1xx5L DiboDFBIgG0P4+q12xcnaGRkQ+OaVAkxlKoyEeEjtRuvRPO0NR6TrbMa9OONTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700096090; a=rsa-sha256; cv=none; b=D0CYs/dojZoCU5HyJkXui5jCxiWX3bX2yJsvOoXW4uEyFfv7boBSK0h0zHo/hrT/BTNibt FJNYi9JTMCU029dUfpH6jR3VMwfNaT0lzoG3LkX6QFvbYBr0Fx+MDkuTiEWEuWX1TRKk75 6ILd2E88qb7LjLvgXFZJ+GttKt8iJ6CI3LPuUyaT5RTsfs5lKdsXMyQCC8HDGJSVwOhTVt kighF2g0c7wDmy39VTiyhqbej191wicOpjhHGuH1kUZ8Yb/UqIBzOV6VqtLDeAYWsh6V/2 jeFG1FyBc/8lijAhIRbNvutM/Ml2/xoLlQkLdnm5WGyR4JhBtMsztSk5FI8nug== 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 4SW1lZ4y0ZzfMw; Thu, 16 Nov 2023 00:54:50 +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 3AG0soGB049004; Thu, 16 Nov 2023 00:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AG0somJ049001; Thu, 16 Nov 2023 00:54:50 GMT (envelope-from git) Date: Thu, 16 Nov 2023 00:54:50 GMT Message-Id: <202311160054.3AG0somJ049001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: fd9ae9ac04ed - main - pkg: Allocate a suitably-sized string for the local ABI List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fd9ae9ac04edf9acef4a2ffbf663698a2b8e7ced Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fd9ae9ac04edf9acef4a2ffbf663698a2b8e7ced commit fd9ae9ac04edf9acef4a2ffbf663698a2b8e7ced Author: John Baldwin AuthorDate: 2023-11-16 00:53:53 +0000 Commit: John Baldwin CommitDate: 2023-11-16 00:53:53 +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 --- 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;