From patchwork Mon Oct 9 16:01:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9993823 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B913A6057C for ; Mon, 9 Oct 2017 16:03:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA0DC2870E for ; Mon, 9 Oct 2017 16:03:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EF4128813; Mon, 9 Oct 2017 16:03:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3C1EF2870E for ; Mon, 9 Oct 2017 16:03:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1aVM-0007wv-2y; Mon, 09 Oct 2017 16:02:08 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1aVK-0007u0-4v for xen-devel@lists.xenproject.org; Mon, 09 Oct 2017 16:02:06 +0000 Received: from [193.109.254.147] by server-1.bemta-6.messagelabs.com id F8/E4-31121-D7D9BD95; Mon, 09 Oct 2017 16:02:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42JxWrrBXrdq7u1 Ig1WrOSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxTX76yFHxQqjjbsImxgXGdZBcjB4eEgL/E vMmeXYycHGwCuhJNW/6ygdgiAtIS/XPa2bsYuTiYBeYzSRyet5gVJCEs4CZxftJCJhCbRUBFY v6nLcwgc3gFPCQenhYHCUsIyEmcP/6TGcTmFPCUWDt7GhtIiRBQyZ8F4RCmmsTc9fEgFbwCgh InZz5hAbGZBSQkDr54wTyBkXcWktQsJKkFjEyrGDWKU4vKUot0Dc31kooy0zNKchMzc3QNDcz 0clOLixPTU3MSk4r1kvNzNzECw4YBCHYw3t4YcIhRkoNJSZR33ozbkUJ8SfkplRmJxRnxRaU5 qcWHGGU4OJQkeF/MAcoJFqWmp1akZeYAAxgmLcHBoyTCO3s2UJq3uCAxtzgzHSJ1ilGXo+Pm3 T9MQix5+XmpUuK8FSAzBECKMkrz4EbAoukSo6yUMC8j0FFCPAWpRbmZJajyrxjFORiVhHkfgU zhycwrgdv0CugIJqAjGItvgBxRkoiQkmpgnLiNc+/Kj++9/i6/zflNo8roRYPq/x/VLrvX/L6 Vta1xnVd4mlf4HPEcx4dp8oa52w1YogI7J4qx+V5muMcSHadxrOLAZa8pQe9WyfmHvRQTrm52 /a3c/k3RyGbvsgzmlAJbTeHdptsMj03/Zn896MntoypfCtSF53I+v/ol9Nipba2VF3X+KLEUZ yQaajEXFScCACK9qFShAgAA X-Env-Sender: prvs=4484f2008=Ian.Jackson@citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1507564919!106225024!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35122 invoked from network); 9 Oct 2017 16:02:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Oct 2017 16:02:01 -0000 X-IronPort-AV: E=Sophos;i="5.42,500,1500940800"; d="scan'208";a="450972897" From: Ian Jackson To: Date: Mon, 9 Oct 2017 17:01:41 +0100 Message-ID: <1507564902-9000-8-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507564902-9000-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 7/8] os-posix: Provide new -runas . facility X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This allows the caller to specify a uid and gid to use, even if there is no corresponding password entry. This will be useful in certain Xen configurations. We don't support just -runas because: (i) deprivileging without calling setgroups would be ineffective (ii) given only a uid we don't know what gid we ought to use (since uids may eppear in multiple passwd file entries with different gids). Signed-off-by: Ian Jackson --- v4: Changed to reuse option -runas v3: Error messages fixed. Thanks to Peter Maydell and Ross Lagerwall. v2: Coding style fixes. --- os-posix.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++---------- qemu-options.hx | 3 ++- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/os-posix.c b/os-posix.c index 92e9d85..9418bd4 100644 --- a/os-posix.c +++ b/os-posix.c @@ -43,6 +43,8 @@ #endif static struct passwd *user_pwd; +static uid_t user_uid = (uid_t)-1; +static gid_t user_gid = (gid_t)-1; static const char *chroot_dir; static int daemonize; static int daemon_pipe; @@ -128,6 +130,34 @@ void os_set_proc_name(const char *s) #endif } + +static bool os_parse_runas_uid_gid(const char *optarg) +{ + unsigned long lv; + char *ep; + uid_t got_uid; + gid_t got_gid; + int rc; + + errno = 0; + lv = strtoul(optarg, &ep, 0); /* can't qemu_strtoul, want *ep=='.' */ + got_uid = lv; /* overflow here is ID in C99 */ + if (errno || *ep != '.' || got_uid != lv || got_uid == (uid_t)-1) { + return false; + } + + lv = 0; + rc = qemu_strtoul(ep + 1, 0, 0, &lv); + got_gid = lv; /* overflow here is ID in C99 */ + if (rc || got_gid != lv || got_gid == (gid_t)-1) { + return false; + } + + user_uid = got_uid; + user_gid = got_gid; + return true; +} + /* * Parse OS specific command line options. * return 0 if option handled, -1 otherwise @@ -145,8 +175,10 @@ void os_parse_cmd_args(int index, const char *optarg) #endif case QEMU_OPTION_runas: user_pwd = getpwnam(optarg); - if (!user_pwd) { - fprintf(stderr, "User \"%s\" doesn't exist\n", optarg); + if (!user_pwd && !os_parse_runas_uid_gid(optarg)) { + fprintf(stderr, + "User \"%s\" doesn't exist (and is not .)\n", + optarg); exit(1); } break; @@ -166,18 +198,28 @@ void os_parse_cmd_args(int index, const char *optarg) static void change_process_uid(void) { - if (user_pwd) { - if (setgid(user_pwd->pw_gid) < 0) { - fprintf(stderr, "Failed to setgid(%d)\n", user_pwd->pw_gid); + if (user_pwd || user_uid != (uid_t)-1) { + gid_t intended_gid = user_pwd ? user_pwd->pw_gid : user_gid; + uid_t intended_uid = user_pwd ? user_pwd->pw_uid : user_uid; + if (setgid(intended_gid) < 0) { + fprintf(stderr, "Failed to setgid(%d)\n", intended_gid); exit(1); } - if (initgroups(user_pwd->pw_name, user_pwd->pw_gid) < 0) { - fprintf(stderr, "Failed to initgroups(\"%s\", %d)\n", - user_pwd->pw_name, user_pwd->pw_gid); - exit(1); + if (user_pwd) { + if (initgroups(user_pwd->pw_name, user_pwd->pw_gid) < 0) { + fprintf(stderr, "Failed to initgroups(\"%s\", %d)\n", + user_pwd->pw_name, user_pwd->pw_gid); + exit(1); + } + } else { + if (setgroups(1, &user_gid) < 0) { + fprintf(stderr, "Failed to setgroups(1, [%d])", + user_gid); + exit(1); + } } - if (setuid(user_pwd->pw_uid) < 0) { - fprintf(stderr, "Failed to setuid(%d)\n", user_pwd->pw_uid); + if (setuid(intended_uid) < 0) { + fprintf(stderr, "Failed to setuid(%d)\n", intended_uid); exit(1); } if (setuid(0) != -1) { diff --git a/qemu-options.hx b/qemu-options.hx index 9f6e2ad..bdff99f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3958,7 +3958,8 @@ ETEXI #ifndef _WIN32 DEF("runas", HAS_ARG, QEMU_OPTION_runas, \ - "-runas user change to user id user just before starting the VM\n", + "-runas user change to user id user just before starting the VM\n" \ + " user can be numeric uid.gid instead\n", QEMU_ARCH_ALL) #endif STEXI