cli qmp: Mark --preconfig, exit-preconfig experimental

[qemu.git] / os-posix.c

diff --git a/os-posix.c b/os-posix.c
index c6ddb7d830198929d2805d74b64336fae12def08..9ce6f74513020cea1fe6996d5f130767c7103c5d 100644 (file)
--- a/os-posix.c
+++ b/os-posix.c
@@ -25,7 +25,6 @@
 
 #include "qemu/osdep.h"
 #include <sys/wait.h>
 
 #include "qemu/osdep.h"
 #include <sys/wait.h>

-/*needed for MAP_POPULATE before including qemu-options.h */

 #include <pwd.h>
 #include <grp.h>
 #include <libgen.h>
 #include <pwd.h>
 #include <grp.h>
 #include <libgen.h>


@@ -34,7 +33,6 @@
 #include "sysemu/sysemu.h"
 #include "net/slirp.h"
 #include "qemu-options.h"
 #include "sysemu/sysemu.h"
 #include "net/slirp.h"
 #include "qemu-options.h"

-#include "qemu/rcu.h"

 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/cutils.h"


@@ -43,7 +41,14 @@
 #include <sys/prctl.h>
 #endif
 
 #include <sys/prctl.h>
 #endif
 

-static struct passwd *user_pwd;
+/*
+ * Must set all three of these at once.
+ * Legal combinations are              unset   by name   by uid
+ */
+static struct passwd *user_pwd;    /*   NULL   non-NULL   NULL   */
+static uid_t user_uid = (uid_t)-1; /*   -1      -1        >=0    */
+static gid_t user_gid = (gid_t)-1; /*   -1      -1        >=0    */
+

 static const char *chroot_dir;
 static int daemonize;
 static int daemon_pipe;
 static const char *chroot_dir;
 static int daemonize;
 static int daemon_pipe;


@@ -120,20 +125,47 @@ void os_set_proc_name(const char *s)
     /* Could rewrite argv[0] too, but that's a bit more complicated.
        This simple way is enough for `top'. */
     if (prctl(PR_SET_NAME, name)) {
     /* Could rewrite argv[0] too, but that's a bit more complicated.
        This simple way is enough for `top'. */
     if (prctl(PR_SET_NAME, name)) {

-        perror("unable to change process name");
+        error_report("unable to change process name: %s", strerror(errno));

         exit(1);
     }
 #else
         exit(1);
     }
 #else

-    fprintf(stderr, "Change of process name not supported by your OS\n");
+    error_report("Change of process name not supported by your OS");

     exit(1);
 #endif
 }
 
     exit(1);
 #endif
 }
 

+
+static bool os_parse_runas_uid_gid(const char *optarg)
+{
+    unsigned long lv;
+    const char *ep;
+    uid_t got_uid;
+    gid_t got_gid;
+    int rc;
+
+    rc = qemu_strtoul(optarg, &ep, 0, &lv);
+    got_uid = lv; /* overflow here is ID in C99 */
+    if (rc || *ep != ':' || got_uid != lv || got_uid == (uid_t)-1) {
+        return false;
+    }
+
+    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_pwd = NULL;
+    user_uid = got_uid;
+    user_gid = got_gid;
+    return true;
+}
+

 /*
  * Parse OS specific command line options.
  * return 0 if option handled, -1 otherwise
  */
 /*
  * Parse OS specific command line options.
  * return 0 if option handled, -1 otherwise
  */

-void os_parse_cmd_args(int index, const char *optarg)
+int os_parse_cmd_args(int index, const char *optarg)

 {
     switch (index) {
 #ifdef CONFIG_SLIRP
 {
     switch (index) {
 #ifdef CONFIG_SLIRP


@@ -146,8 +178,13 @@ void os_parse_cmd_args(int index, const char *optarg)
 #endif
     case QEMU_OPTION_runas:
         user_pwd = getpwnam(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) {
+            user_uid = -1;
+            user_gid = -1;
+        } else if (!os_parse_runas_uid_gid(optarg)) {
+            error_report("User \"%s\" doesn't exist"
+                         " (and is not <uid>:<gid>)",
+                         optarg);

             exit(1);
         }
         break;
             exit(1);
         }
         break;


@@ -162,27 +199,45 @@ void os_parse_cmd_args(int index, const char *optarg)
         fips_set_state(true);
         break;
 #endif
         fips_set_state(true);
         break;
 #endif

+    default:
+        return -1;

     }
     }

+
+    return 0;

 }
 
 static void change_process_uid(void)
 {
 }
 
 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);
+    assert((user_uid == (uid_t)-1) || user_pwd == NULL);
+    assert((user_uid == (uid_t)-1) ==
+           (user_gid == (gid_t)-1));
+
+    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) {
+            error_report("Failed to setgid(%d)", intended_gid);

             exit(1);
         }
             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) {
+                error_report("Failed to initgroups(\"%s\", %d)",
+                        user_pwd->pw_name, user_pwd->pw_gid);
+                exit(1);
+            }
+        } else {
+            if (setgroups(1, &user_gid) < 0) {
+                error_report("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) {
+            error_report("Failed to setuid(%d)", intended_uid);

             exit(1);
         }
         if (setuid(0) != -1) {
             exit(1);
         }
         if (setuid(0) != -1) {

-            fprintf(stderr, "Dropping privileges failed\n");
+            error_report("Dropping privileges failed");

             exit(1);
         }
     }
             exit(1);
         }
     }


@@ -192,11 +247,11 @@ static void change_root(void)
 {
     if (chroot_dir) {
         if (chroot(chroot_dir) < 0) {
 {
     if (chroot_dir) {
         if (chroot(chroot_dir) < 0) {

-            fprintf(stderr, "chroot failed\n");
+            error_report("chroot failed");

             exit(1);
         }
         if (chdir("/")) {
             exit(1);
         }
         if (chdir("/")) {

-            perror("not able to chdir to /");
+            error_report("not able to chdir to /: %s", strerror(errno));

             exit(1);
         }
     }
             exit(1);
         }
     }


@@ -249,7 +304,6 @@ void os_daemonize(void)
         signal(SIGTSTP, SIG_IGN);
         signal(SIGTTOU, SIG_IGN);
         signal(SIGTTIN, SIG_IGN);
         signal(SIGTSTP, SIG_IGN);
         signal(SIGTTOU, SIG_IGN);
         signal(SIGTTIN, SIG_IGN);

-        rcu_after_fork();

     }
 }
 
     }
 }
 


@@ -259,7 +313,7 @@ void os_setup_post(void)
 
     if (daemonize) {
         if (chdir("/")) {
 
     if (daemonize) {
         if (chdir("/")) {

-            perror("not able to chdir to /");
+            error_report("not able to chdir to /: %s", strerror(errno));

             exit(1);
         }
         TFR(fd = qemu_open("/dev/null", O_RDWR));
             exit(1);
         }
         TFR(fd = qemu_open("/dev/null", O_RDWR));


@@ -333,7 +387,7 @@ int os_mlock(void)
 
     ret = mlockall(MCL_CURRENT | MCL_FUTURE);
     if (ret < 0) {
 
     ret = mlockall(MCL_CURRENT | MCL_FUTURE);
     if (ret < 0) {

-        perror("mlockall");
+        error_report("mlockall: %s", strerror(errno));

     }
 
     return ret;
     }
 
     return ret;