From nobody Mon Dec 11 19:27:32 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 4SpsFw3Dxxz540Ln; Mon, 11 Dec 2023 19:27:32 +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 4SpsFw2dwVz4djF; Mon, 11 Dec 2023 19:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702322852; 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=CzgUtuqeVm542QXKbkVCw8+PcBpCNNOm0f5g3YOZ9iM=; b=rVo1Gw7eGRKbb3J9AkI3iIgBc+DyitbGAvzWuYsV3LDZ5txiKdTXmd1pwD1SK/Pzej/3vp MaWt8YuoYBSLoRerUtusoEd4FjARMJwOqPs6VrqBr3pxeleE+Di2En7Qdy2yEfn2jKIpUf FDejf0xYYhlwk6scdsfeJRWMRLTzFoUu1sHN4nfjknfv4lFdJBbm2uavg8S8W99xPReNXC O8rgjQJ1lsFwCbBk8uBbk1T/iphC/h8pAeZb+dh4riWLWoLJXDNDOEa78Tjwuowhab5YnL oQ2ttWDUtQxYmyMG8wRXpM0sj3U9TcjhRkBYsnFUiYYDfxuAAkt3srar15NC4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702322852; a=rsa-sha256; cv=none; b=WiaHcX9Kw9+6p+6VwZayq/27Jt6V2dOhBoalnsazyTii5f0sLA146LrWZPGhXiqkpvwjxp gFa5pnH5m+fnL+Hret3VLfnFKT4I5z5JHKKxvF9Uqw0V1nAFTrQ0zG37SzePaCy0sndIct rlnFHv2tUx+ZRgrSnfR6o0f/88afjIJUD/ZeYSb8Hm1KwrXhi/bTcnPYTcasBUdLKtMdrH jbDEzpwZlp1tuYhztMfQDgiaqWzdo7pAfubhCYoP4mggidYcAMuN4TPQMhFxJznNlL5aWh GvdzUBCGjIC3oFfH6LDFa5GccPAe6xaARxMmF9BV2zXFcKmvU9ldXpWJYvjRkQ== 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=1702322852; 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=CzgUtuqeVm542QXKbkVCw8+PcBpCNNOm0f5g3YOZ9iM=; b=bX3Ny7R8u3VRqgnPh2Gdu7cf8YcbtiMMGzwHdquTjbIEzhaaqTPG7y/qQ9kOveBLU4Kv4b PzK5pxVETS1HKNpIdn5CwuCdeSasqPrXT02p+SKdtULXn8eofS84Qz3+H7ydyu3oJtot1l r97cd19tBJ6jynb+laBxv/R23T+Roa2/zeY1WjdVLlKoWftRBHqO1q6d5m36t/VUVt3k65 Ih62ale5xkJ/6z1B3b27836tj2Sy/qqp+xkVqiPqS+PRqJa1C7tYLGlVQj7/3a+Zrn+2Qz kEC8m21pJbLOKl6IV+qJe6GzsXFLSLcTuF3DuylHqlM7k8vJoU7yUA91xr7WQA== 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 4SpsFw1ftDzkHx; Mon, 11 Dec 2023 19:27:32 +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 3BBJRW3V091355; Mon, 11 Dec 2023 19:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BBJRWon091352; Mon, 11 Dec 2023 19:27:32 GMT (envelope-from git) Date: Mon, 11 Dec 2023 19:27:32 GMT Message-Id: <202312111927.3BBJRWon091352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8ccd0b876e67 - main - libc: expose execvpe for Linux compat 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ccd0b876e67fda6249f294ff484798cc1e1569f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8ccd0b876e67fda6249f294ff484798cc1e1569f commit 8ccd0b876e67fda6249f294ff484798cc1e1569f Author: Brooks Davis AuthorDate: 2023-12-11 19:24:53 +0000 Commit: Brooks Davis CommitDate: 2023-12-11 19:24:53 +0000 libc: expose execvpe for Linux compat We already implemented execvpe internally with an _ prefix in libc so go ahead and expose it for compatibility with Linux. This reverts c605eea952146348e5e1ad5cab6c127d7a1bd164. Bump __FreeBSD_version for the addition and add definitions to supress compat shims in libzfs (zfs changes were merged from upstream). PR: 275370 (request and exp-run (thanks antoine!)) Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D42846 --- cddl/lib/libzfs/Makefile | 1 + cddl/usr.sbin/zfsd/Makefile.common | 2 +- include/unistd.h | 1 + lib/libc/gen/Symbol.map | 4 ++++ lib/libc/gen/exec.3 | 24 ++++++++++++++++++++---- lib/libc/gen/exec.c | 4 ++-- lib/libc/gen/posix_spawn.c | 4 ++-- lib/libc/include/libc_private.h | 3 --- sys/sys/param.h | 2 +- 9 files changed, 32 insertions(+), 13 deletions(-) diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index ee57c30cc6ca..c05fe0c1c12b 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -99,6 +99,7 @@ CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_EXECVPE CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h CFLAGS+= -DSYSCONFDIR=\"/etc\" CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common index 1755031fee72..c1ed4bba9289 100644 --- a/cddl/usr.sbin/zfsd/Makefile.common +++ b/cddl/usr.sbin/zfsd/Makefile.common @@ -22,8 +22,8 @@ CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -I${SRCTOP}/cddl/usr.sbin -# use issetugid(2) CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_EXECVPE LIBADD+= devdctl zfs util geom bsdxml sbuf nvpair avl uutil zutil diff --git a/include/unistd.h b/include/unistd.h index e3e5675b3da0..8a01d563fe99 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -501,6 +501,7 @@ int eaccess(const char *, int); void endusershell(void); int exect(const char *, char * const *, char * const *); int execvP(const char *, const char *, char * const *); +int execvpe(const char *, char * const *, char * const *); int feature_present(const char *); char *fflagstostr(u_long); int getdomainname(char *, int); diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index b68d63b279f3..51c7348c5cc4 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -457,6 +457,10 @@ FBSD_1.7 { __cpuset_free; }; +FBSD_1.8 { + execvpe; +}; + FBSDprivate_1.0 { /* needed by thread libraries */ __thr_jtable; diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3 index 539a4b2ba42d..8f866e5ab321 100644 --- a/lib/libc/gen/exec.3 +++ b/lib/libc/gen/exec.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 22, 2020 +.Dd December 11, 2023 .Dt EXEC 3 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nm exect , .Nm execv , .Nm execvp , +.Nm execvpe , .Nm execvP .Nd execute a file .Sh LIBRARY @@ -56,6 +57,8 @@ .Ft int .Fn execvp "const char *file" "char *const argv[]" .Ft int +.Fn execvpe "const char *file" "char *const argv[]" "char *const envp[]" +.Ft int .Fn execvP "const char *file" "const char *search_path" "char *const argv[]" .Sh DESCRIPTION The @@ -97,6 +100,7 @@ The .Fn exect , .Fn execv , .Fn execvp , +.Fn execvpe , and .Fn execvP functions provide an array of pointers to null-terminated strings that @@ -110,9 +114,10 @@ be terminated by a pointer. .Pp The -.Fn execle +.Fn execle , +.Fn exect , and -.Fn exect +.Fn execvpe functions also specify the environment of the executed process by following the .Dv NULL @@ -134,6 +139,7 @@ Some of these functions have special semantics. The functions .Fn execlp , .Fn execvp , +.Fn execvpe , and .Fn execvP will duplicate the actions of the shell in searching for an executable file @@ -144,6 +150,7 @@ For .Fn execlp and .Fn execvp , +.Fn execvpe , search path is the path specified in the environment by .Dq Ev PATH variable. @@ -269,7 +276,8 @@ The .Fn execl , .Fn execle , .Fn execlp , -.Fn execvp +.Fn execvp , +.Fn execvpe , and .Fn execvP functions @@ -307,6 +315,9 @@ and functions conform to .St -p1003.1-88 . +The +.Fn execvpe +function is a GNU extension. .Sh HISTORY The .Fn exec @@ -330,6 +341,10 @@ The .Fn execvP function first appeared in .Fx 5.2 . +The +.Fn execvpe +function first appeared in +.Fx 15.0 . .Sh BUGS The type of the .Fa argv @@ -340,6 +355,7 @@ parameters to .Fn exect , .Fn execv , .Fn execvp , +.Fn execvpe , and .Fn execvP is a historical accident and no sane implementation should modify the provided diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c index d2181c6e2b91..d9285733e965 100644 --- a/lib/libc/gen/exec.c +++ b/lib/libc/gen/exec.c @@ -136,7 +136,7 @@ execv(const char *name, char * const *argv) int execvp(const char *name, char * const *argv) { - return (_execvpe(name, argv, environ)); + return (execvpe(name, argv, environ)); } static int @@ -288,7 +288,7 @@ execvP(const char *name, const char *path, char * const argv[]) } int -_execvpe(const char *name, char * const argv[], char * const envp[]) +execvpe(const char *name, char * const argv[], char * const envp[]) { const char *path; diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index b1bb49d63ffd..a067d1f68ea5 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -226,7 +226,7 @@ struct posix_spawn_args { #if defined(__i386__) || defined(__amd64__) /* * Below we'll assume that _RFORK_THREAD_STACK_SIZE is appropriately aligned for - * the posix_spawn() case where we do not end up calling _execvpe and won't ever + * the posix_spawn() case where we do not end up calling execvpe and won't ever * try to allocate space on the stack for argv[]. */ #define _RFORK_THREAD_STACK_SIZE 4096 @@ -253,7 +253,7 @@ _posix_spawn_thr(void *data) } envp = psa->envp != NULL ? psa->envp : environ; if (psa->use_env_path) - _execvpe(psa->path, psa->argv, envp); + execvpe(psa->path, psa->argv, envp); else _execve(psa->path, psa->argv, envp); psa->error = errno; diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index a9ad2ef21b0b..bfeada696538 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -422,9 +422,6 @@ int __sys_futimens(int fd, const struct timespec *times) __hidden; int __sys_utimensat(int fd, const char *path, const struct timespec *times, int flag) __hidden; -/* execve() with PATH processing to implement posix_spawnp() */ -int _execvpe(const char *, char * const *, char * const *); - int _elf_aux_info(int aux, void *buf, int buflen); struct dl_phdr_info; int __elf_phdr_match_addr(struct dl_phdr_info *, void *); diff --git a/sys/sys/param.h b/sys/sys/param.h index c79c46ab4342..20f0af949110 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500006 +#define __FreeBSD_version 1500007 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,