From nobody Sat Apr 26 03:24:58 2025 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 4Zkw7b3qNrz5tY3V; Sat, 26 Apr 2025 03:24:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zkw7Z38zjz3Q2L; Sat, 26 Apr 2025 03:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745637898; 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=lEOuOU0qKHNKwIkyPErvYMmUoVohb8rLdPDKXIpUSck=; b=GpVDS5VSw5RtbLo46Fsj0rpRv85Sq9OnrBjqA23DmVUj5qKsb+bh2u3eK1Be0T4mKDc70J xaBEAhp6GepQ+FQ4WJTN6vvOFPMQ1eqwBkiV6UAGf/d3ni5KZm1qb3mWniaR07UwvjkveQ 8g2dWe+POGzVliXKm3dVL/2wCqocil4ozdKNl+RPWB+u1kYuLZLqc2a0x1v9EsZfB+36c1 T/S0++Igf0fEa+AEoIqF/B0F+/TJyMy79+1YYnsCcAcHxY/ecgcVJqAsjFc6NLUXVhEbK0 bMXO736lD7Xxt4vx/WtltZJEhhLsvR+nkHaifG0q8OIMzEGGPwayFh30GbtDjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745637898; a=rsa-sha256; cv=none; b=GfUlLvErGvVAKstpDRJ8LLRhd2lvyphKO+XLLz8DFR4o/xGOceRDtY66g3Och6x8YGroT7 whqw6NHwX4b/gHfEOd/48KslfFVH/f3INIcfmhbWHxN69i3/8uNSM+bUvmHFu9dWU/6J7l PA4j+zkLJyUsOELVv1UcHLSjM2mXKyEZWYHKF0dAAcWyt7mo5YkXPr3h+sDKz92Bljk/f1 hwOLf65DN4TavWN/227jxO+Ozz6b3l1baeiN2QtNvymth505RCucFr/wDXWGYNXUdJz74h Xt5gsLtgfbdwWSnAlJzrFOPsOXH0/1cFmWCrCDoDHva+V3SazOlaX2OjAEf7VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745637898; 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=lEOuOU0qKHNKwIkyPErvYMmUoVohb8rLdPDKXIpUSck=; b=JMA7Y6r6bNNpWvx4dsFVA8PrbV+30qD6NAb0CTpbnARRVQe/KTKEDUn+sJ60iLnWJclUpb llL7jr/EhGyheqfRK+ckdgdwNN1Vh6dzJPbv1Bd/RCNJzdVwzQ0tAd4xpjqfgHMaSEO2tO +hKRkYVwBdsxkAyd82JNu0OTe+PYZwb6+LGnt5/sm0WX7VHPkxT53d0lMzPmZAAxEI5l8/ GtRbZgxvk6zjb/2jk/rQAqO8OepgvXD5MczZkxVrIA5KRR89R//J6FwPlEfdrmS4e76aSR kR7dGt0UVoI8KBhwoefYkEJKOiBcLynp1pyGEvDvtTsvy1TjXwG1XExPaAVV1g== 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 4Zkw7Z2dvrz1383; Sat, 26 Apr 2025 03:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53Q3OwS0017658; Sat, 26 Apr 2025 03:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53Q3OweF017655; Sat, 26 Apr 2025 03:24:58 GMT (envelope-from git) Date: Sat, 26 Apr 2025 03:24:58 GMT Message-Id: <202504260324.53Q3OweF017655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 8dc42b80fdfb - stable/14 - libbe: don't hardcode /tmp 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8dc42b80fdfb0f39ba52560ac35b6914c72fcff5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8dc42b80fdfb0f39ba52560ac35b6914c72fcff5 commit 8dc42b80fdfb0f39ba52560ac35b6914c72fcff5 Author: Kyle Evans AuthorDate: 2025-04-21 03:47:59 +0000 Commit: Kyle Evans CommitDate: 2025-04-26 03:24:13 +0000 libbe: don't hardcode /tmp Respect $TMPDIR if it's set, fallback to _PATH_TMP (not hardcoded /tmp) if it's not. Bump .Dd after recent commits. Reviewed by: rcm (cherry picked from commit 2f11393fee4d60d38634a261edf9aa9fea39c75c) --- lib/libbe/be_access.c | 14 ++++++++++++-- lib/libbe/libbe.3 | 6 +++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c index 51f5a75e957d..44e7eb1e651c 100644 --- a/lib/libbe/be_access.c +++ b/lib/libbe/be_access.c @@ -33,7 +33,7 @@ #include "be.h" #include "be_impl.h" -#define LIBBE_MOUNT_PREFIX "be_mount." /* XXX */ +#define LIBBE_MOUNT_PREFIX "be_mount." struct be_mountcheck_info { const char *path; @@ -261,7 +261,17 @@ be_mount(libbe_handle_t *lbh, const char *bootenv, const char *mountpoint, /* Create mountpoint if it is not specified */ if (mountpoint == NULL) { - strlcpy(mnt_temp, "/tmp/be_mount.XXXX", sizeof(mnt_temp)); + const char *tmpdir; + + tmpdir = getenv("TMPDIR"); + if (tmpdir == NULL) + tmpdir = _PATH_TMP; + + if (snprintf(mnt_temp, sizeof(mnt_temp), "%s%s%sXXXX", tmpdir, + tmpdir[strlen(tmpdir) - 1] == '/' ? "" : "/", + LIBBE_MOUNT_PREFIX) >= (int)sizeof(mnt_temp)) + return (set_error(lbh, BE_ERR_PATHLEN)); + if (mkdtemp(mnt_temp) == NULL) return (set_error(lbh, BE_ERR_IO)); } diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index 743922a76391..c1bf52e42324 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 18, 2024 +.Dd April 25, 2025 .Dt LIBBE 3 .Os .Sh NAME @@ -358,6 +358,10 @@ If is .Dv NULL , a mount point will be generated in +.Ev TMPDIR +or, if +.Ev TMPDIR +is not set, .Pa /tmp using .Xr mkdtemp 3 .