aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--hurd/fchroot.c28
-rw-r--r--sysdeps/mach/hurd/chroot.c50
3 files changed, 70 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 71f55ada12..b2a9a83138 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-19 Mark Kettenis <kettenis@gnu.org>
+
+ * sysdeps/mach/hurd/chroot.c (chroot): Revert 1999-02-27 changes,
+ but change looking up the initial directory port in a similar way
+ as done by _hurd_change_directory_port_from_name.
+ * hurd/fchroot.c (fchroot): Likewise.
+
2001-01-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): If HAVE_AUX_XID is
diff --git a/hurd/fchroot.c b/hurd/fchroot.c
index cfb8ae339d..ad9fdc46b5 100644
--- a/hurd/fchroot.c
+++ b/hurd/fchroot.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,14 +17,34 @@
Boston, MA 02111-1307, USA. */
#include <unistd.h>
+
#include <hurd.h>
#include <hurd/fd.h>
-#include <fcntl.h>
+#include <hurd/port.h>
/* Change the current root directory to FD. */
int
fchroot (int fd)
{
- return _hurd_change_directory_port_from_fd (&_hurd_ports[INIT_PORT_CRDIR],
- fd);
+ error_t err;
+ file_t dir;
+
+ err = HURD_DPORT_USE (fd,
+ ({
+ dir = __file_name_lookup_under (port, ".", 0, 0);
+ dir == MACH_PORT_NULL ? errno : 0;
+ }));
+
+ if (! err)
+ {
+ file_t root;
+
+ /* Prevent going through DIR's .. */
+ err = __file_reparent (dir, MACH_PORT_NULL, &root);
+ __mach_port_deallocate (__mach_task_self (), dir);
+ if (! err)
+ _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], root);
+ }
+
+ return err ? __hurd_fail (err) : 0;
}
diff --git a/sysdeps/mach/hurd/chroot.c b/sysdeps/mach/hurd/chroot.c
index d607146ddf..918a36363a 100644
--- a/sysdeps/mach/hurd/chroot.c
+++ b/sysdeps/mach/hurd/chroot.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,97,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,97,99,2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,20 +16,48 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <errno.h>
-#include <stddef.h>
+#include <string.h>
#include <unistd.h>
+
#include <hurd.h>
-#include <fcntl.h>
#include <hurd/port.h>
-/* Change the current root to FILE_NAME. */
-
-/* XXX shouldn't this be __chroot? */
+/* Make PATH be the root directory (the starting point for absolute
+ paths). Note that while on traditional UNIX systems this call is
+ restricted to the super-user, it isn't on the Hurd. */
int
-chroot (file_name)
- const char *file_name;
+chroot (const char *path)
{
- return _hurd_change_directory_port_from_name (&_hurd_ports[INIT_PORT_CRDIR],
- file_name);
+ const char *lookup;
+ size_t len;
+ file_t dir, root;
+ error_t err;
+
+ /* Append trailing "/." to directory name to force ENOTDIR if it's not a
+ directory and EACCES if we don't have search permission. */
+ len = strlen (path);
+ if (path[len - 2] == '/' && path[len - 1] == '.')
+ lookup = path;
+ else
+ {
+ char *n = alloca (len + 2);
+ memcpy (n, path, len);
+ n[len] = '/';
+ n[len + 1] = '.';
+ n[len + 2] = '\0';
+ lookup = n;
+ }
+
+ dir = __file_name_lookup (lookup, 0, 0);
+ if (dir == MACH_PORT_NULL)
+ return -1;
+
+ /* Prevent going through DIR's .. */
+ err = __file_reparent (dir, MACH_PORT_NULL, &root);
+ __mach_port_deallocate (__mach_task_self (), dir);
+ if (err)
+ return __hurd_fail (err);
+
+ _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], root);
+ return 0;
}