From 3dfc0a8c5da8f3a4a6c13e936d4306b79b231dde Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Mon, 22 Jun 2009 12:40:57 +0100 Subject: [PATCH] Make CHROOT_IN/OUT macros should loudly if the syscall fails. --- daemon/daemon.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index 115db09..70f0bee 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -162,11 +162,22 @@ extern void reply (xdrproc_t xdrp, char *ret); * (2) You must not change directory! cwd must always be "/", otherwise * we can't escape our own chroot. * (3) All paths specified must be absolute. - * (4) CHROOT_OUT does not affect errno. + * (4) Neither macro affects errno. */ -#define CHROOT_IN chroot ("/sysroot"); -#define CHROOT_OUT \ - do { int old_errno = errno; chroot ("."); errno = old_errno; } while (0) +#define CHROOT_IN \ + do { \ + int __old_errno = errno; \ + if (chroot ("/sysroot") == -1) \ + perror ("CHROOT_IN: sysroot"); \ + errno = __old_errno; \ + } while (0) +#define CHROOT_OUT \ + do { \ + int __old_errno = errno; \ + if (chroot (".") == -1) \ + perror ("CHROOT_OUT: ."); \ + errno = __old_errno; \ + } while (0) /* Marks functions which are not implemented. * NB. Cannot be used for FileIn functions. -- 1.8.3.1