From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/13170
Path: news.gmane.org!.POSTED!not-for-mail
From: Rich Felker <dalias@libc.org>
Newsgroups: gmane.linux.lib.musl.general
Subject: Re: [PATCH] fexecve: implement in terms of execveat when it
 exists
Date: Sun, 2 Sep 2018 13:11:24 -0400
Message-ID: <20180902171124.GW1878@brightrain.aerifal.cx>
References: <CABpewhEt=raW3t4PJyANcpcudd5udWewOmhynfWbJ1gUJ7ty5A@mail.gmail.com>
Reply-To: musl@lists.openwall.com
NNTP-Posting-Host: blaine.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: blaine.gmane.org 1535908175 6708 195.159.176.226 (2 Sep 2018 17:09:35 GMT)
X-Complaints-To: usenet@blaine.gmane.org
NNTP-Posting-Date: Sun, 2 Sep 2018 17:09:35 +0000 (UTC)
User-Agent: Mutt/1.5.21 (2010-09-15)
To: musl@lists.openwall.com
Original-X-From: musl-return-13186-gllmg-musl=m.gmane.org@lists.openwall.com Sun Sep 02 19:09:31 2018
Return-path: <musl-return-13186-gllmg-musl=m.gmane.org@lists.openwall.com>
Envelope-to: gllmg-musl@m.gmane.org
Original-Received: from mother.openwall.net ([195.42.179.200])
	by blaine.gmane.org with smtp (Exim 4.84_2)
	(envelope-from <musl-return-13186-gllmg-musl=m.gmane.org@lists.openwall.com>)
	id 1fwVsQ-0001ck-PN
	for gllmg-musl@m.gmane.org; Sun, 02 Sep 2018 19:09:30 +0200
Original-Received: (qmail 30096 invoked by uid 550); 2 Sep 2018 17:11:38 -0000
Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm
Precedence: bulk
List-Post: <mailto:musl@lists.openwall.com>
List-Help: <mailto:musl-help@lists.openwall.com>
List-Unsubscribe: <mailto:musl-unsubscribe@lists.openwall.com>
List-Subscribe: <mailto:musl-subscribe@lists.openwall.com>
List-ID: <musl.lists.openwall.com>
Original-Received: (qmail 30078 invoked from network); 2 Sep 2018 17:11:37 -0000
Content-Disposition: inline
In-Reply-To: <CABpewhEt=raW3t4PJyANcpcudd5udWewOmhynfWbJ1gUJ7ty5A@mail.gmail.com>
Original-Sender: Rich Felker <dalias@aerifal.cx>
Xref: news.gmane.org gmane.linux.lib.musl.general:13170
Archived-At: <http://permalink.gmane.org/gmane.linux.lib.musl.general/13170>

On Sun, Sep 02, 2018 at 12:04:55AM -0400, Joseph Sible wrote:
> This lets fexecve work even when /proc isn't mounted.
> ---
>  src/process/fexecve.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/src/process/fexecve.c b/src/process/fexecve.c
> index 6507b42..905487e 100644
> --- a/src/process/fexecve.c
> +++ b/src/process/fexecve.c
> @@ -1,13 +1,20 @@
> +#define _GNU_SOURCE
>  #include <unistd.h>
>  #include <errno.h>
> +#include <fcntl.h>
> +#include "syscall.h"
> 
>  void __procfdname(char *, unsigned);
> 
>  int fexecve(int fd, char *const argv[], char *const envp[])
>  {
> +#ifdef SYS_execveat
> +       return syscall(SYS_execveat, fd, "", argv, envp, AT_EMPTY_PATH);
> +#else
>         char buf[15 + 3*sizeof(int)];
>         __procfdname(buf, fd);
>         execve(buf, argv, envp);
>         if (errno == ENOENT) errno = EBADF;
>         return -1;
> +#endif
>  }
> --
> 2.7.4

This breaks programs running on any kernel older than 3.19.

Instead it needs to be something like

	int r = __syscall(SYS_execveat, fd, "", argv, envp, AT_EMPTY_PATH);
	if (r!=-ENOSYS) return __syscall_ret(r);
	...

with no #ifdef. #ifdef SYS_anything is only valid in musl when the
existence of the syscall is arch-specific. The defines come from musl
itself, so trying to use it for something version-specific does not
make sense; it would be unconditionally true or false.

Rich