* [hurd,commited] hurd: Fix fexecve
@ 2020-05-28 23:32 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2020-05-28 23:32 UTC (permalink / raw)
To: libc-alpha; +Cc: commit-hurd
* sysdeps/mach/hurd/fexecve.c (fexecve): Re-lookup fd with O_EXEC before
calling _hurd_exec_paths.
---
sysdeps/mach/hurd/fexecve.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/sysdeps/mach/hurd/fexecve.c b/sysdeps/mach/hurd/fexecve.c
index 2b24e46fbf..c6a00ebf1e 100644
--- a/sysdeps/mach/hurd/fexecve.c
+++ b/sysdeps/mach/hurd/fexecve.c
@@ -25,10 +25,23 @@
int
fexecve (int fd, char *const argv[], char *const envp[])
{
- error_t err = HURD_DPORT_USE (fd, _hurd_exec_paths (__mach_task_self (),
- port, NULL, NULL,
- argv, envp));
+ file_t file;
+ error_t err;
+ enum retry_type doretry;
+ char retryname[1024];
+
+ err = HURD_DPORT_USE (fd,
+ __dir_lookup (port, "", O_EXEC, 0, &doretry, retryname, &file));
+
+ if (! err && (doretry != FS_RETRY_NORMAL || retryname[0] != '\0'))
+ err = EGRATUITOUS;
+ if (err)
+ return __hurd_fail(err);
+
+ err = _hurd_exec_paths (__mach_task_self (), file, NULL, NULL, argv, envp);
if (! err)
err = EGRATUITOUS;
+
+ __mach_port_deallocate (__mach_task_self (), file);
return __hurd_fail (err);
}
--
2.26.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-05-28 23:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-28 23:32 [hurd,commited] hurd: Fix fexecve Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).