From patchwork Fri Jun 4 13:24:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 54592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0261EB7D1C for ; Sat, 5 Jun 2010 00:26:28 +1000 (EST) Received: from localhost ([127.0.0.1]:45930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKXqX-0002x1-A0 for incoming@patchwork.ozlabs.org; Fri, 04 Jun 2010 10:26:05 -0400 Received: from [140.186.70.92] (port=47166 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKX07-0005kF-AI for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:31:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKWtg-0001sD-2P for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:25:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57881) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKWtf-0001rr-RX for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:25:16 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o54DPD6h023502 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Jun 2010 09:25:13 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o54DOm6c005003; Fri, 4 Jun 2010 09:25:11 -0400 From: Jes.Sorensen@redhat.com To: anthony@codemonkey.ws Date: Fri, 4 Jun 2010 15:24:38 +0200 Message-Id: <1275657882-19268-16-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1275657882-19268-1-git-send-email-Jes.Sorensen@redhat.com> References: <1275657882-19268-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Jes Sorensen , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 13/17] Move chroot handling to OS specific files. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen Move chroot handling to OS specific files. Signed-off-by: Jes Sorensen --- os-posix.c | 19 +++++++++++++++++++ qemu-os-posix.h | 1 + qemu-os-win32.h | 1 + vl.c | 18 +----------------- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/os-posix.c b/os-posix.c index 8b686a4..6417d16 100644 --- a/os-posix.c +++ b/os-posix.c @@ -38,6 +38,7 @@ #include "qemu-options.h" static struct passwd *user_pwd; +static const char *chroot_dir; void os_setup_early_signal_handling(void) { @@ -156,6 +157,9 @@ void os_parse_cmd_args(int index, const char *optarg) exit(1); } break; + case QEMU_OPTION_chroot: + chroot_dir = optarg; + break; } return; } @@ -177,3 +181,18 @@ void os_change_process_uid(void) } } } + +void os_change_root(void) +{ + if (chroot_dir) { + if (chroot(chroot_dir) < 0) { + fprintf(stderr, "chroot failed\n"); + exit(1); + } + if (chdir("/")) { + perror("not able to chdir to /"); + exit(1); + } + } + +} diff --git a/qemu-os-posix.h b/qemu-os-posix.h index ecceb5e..ae9d5a8 100644 --- a/qemu-os-posix.h +++ b/qemu-os-posix.h @@ -33,5 +33,6 @@ static inline void os_host_main_loop_wait(int *timeout) void os_setup_early_signal_handling(void); void os_setup_signal_handling(void); void os_change_process_uid(void); +void os_change_root(void); #endif diff --git a/qemu-os-win32.h b/qemu-os-win32.h index eff0242..3ce72cf 100644 --- a/qemu-os-win32.h +++ b/qemu-os-win32.h @@ -45,5 +45,6 @@ void os_host_main_loop_wait(int *timeout); static inline void os_setup_signal_handling(void) {} static inline void os_change_process_uid(void) {} +static inline void os_change_root(void) {} #endif diff --git a/vl.c b/vl.c index 5fa4c79..fc0e23d 100644 --- a/vl.c +++ b/vl.c @@ -2309,7 +2309,6 @@ int main(int argc, char **argv, char **envp) const char *incoming = NULL; #ifndef _WIN32 int fd = 0; - const char *chroot_dir = NULL; #endif int show_vnc_port = 0; int defconfig = 1; @@ -3053,11 +3052,6 @@ int main(int argc, char **argv, char **envp) default_cdrom = 0; default_sdcard = 0; break; -#ifndef _WIN32 - case QEMU_OPTION_chroot: - chroot_dir = optarg; - break; -#endif case QEMU_OPTION_xen_domid: if (!(xen_available())) { printf("Option %s not supported for this target\n", popt->name); @@ -3546,17 +3540,7 @@ int main(int argc, char **argv, char **envp) exit(1); } - if (chroot_dir) { - if (chroot(chroot_dir) < 0) { - fprintf(stderr, "chroot failed\n"); - exit(1); - } - if (chdir("/")) { - perror("not able to chdir to /"); - exit(1); - } - } - + os_change_root(); os_change_process_uid(); if (daemonize) {