From bf755d50d117057d2be1197341e1d91bc5f1a808 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Mon, 5 Jul 2010 17:11:34 +0200 Subject: [PATCH] Box: Let the 32-bit version refuse to run on 64-bit kernels --- box/box.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/box/box.c b/box/box.c index d834ffd..fb62376 100644 --- a/box/box.c +++ b/box/box.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #if defined(CONFIG_BOX_KERNEL_AMD64) && !defined(CONFIG_BOX_USER_AMD64) @@ -718,6 +719,11 @@ set_syscall_nr(struct syscall_args *a, arg_t sys) die("ptrace(PTRACE_SETREGS): %m"); } +static void +sanity_check(void) +{ +} + #else static void @@ -741,6 +747,19 @@ set_syscall_nr(struct syscall_args *a, arg_t sys) die("ptrace(PTRACE_SETREGS): %m"); } +static void +sanity_check(void) +{ +#if !defined(CONFIG_BOX_ALLOW_INSECURE) + struct utsname uts; + if (uname(&uts) < 0) + die("uname() failed: %m"); + + if (!strcmp(uts.machine, "x86_64")) + die("Running 32-bit sandbox on 64-bit kernels is inherently unsafe. Please get a 64-bit version."); +#endif +} + #endif /*** Syscall checks ***/ @@ -1316,6 +1335,7 @@ main(int argc, char **argv) if (optind >= argc) usage(); + sanity_check(); uid = geteuid(); if (setreuid(uid, uid) < 0) die("setreuid: %m"); -- 2.39.2