upgraded: link dynamically, chroot during exec

[project/procd.git] / system.c

diff --git a/system.c b/system.c
index bb2abe5e527e356fba70a6853ec8a57342311dbc..193c9b05afa6ef5a160a1b11633eb4b543b13fe4 100644 (file)
--- a/system.c
+++ b/system.c
@@ -345,27 +345,40 @@ static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj,
 
 enum {
        SYSUPGRADE_PATH,
 
 enum {
        SYSUPGRADE_PATH,

+       SYSUPGRADE_PREFIX,

        __SYSUPGRADE_MAX
 };
 
 static const struct blobmsg_policy sysupgrade_policy[__SYSUPGRADE_MAX] = {
        [SYSUPGRADE_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
        __SYSUPGRADE_MAX
 };
 
 static const struct blobmsg_policy sysupgrade_policy[__SYSUPGRADE_MAX] = {
        [SYSUPGRADE_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },

+       [SYSUPGRADE_PREFIX] = { .name = "prefix", .type = BLOBMSG_TYPE_STRING },

 };
 
 static void
 };
 
 static void

-procd_spawn_upgraded(char *path)
+procd_exec_upgraded(const char *prefix, char *path)

 {
        char *wdt_fd = watchdog_fd();
 {
        char *wdt_fd = watchdog_fd();

-       char *argv[] = { "/tmp/upgraded", NULL, NULL};
+       char *argv[] = { "/sbin/upgraded", NULL, NULL};
+
+       if (chroot(prefix)) {
+               fprintf(stderr, "Failed to chroot for upgraded exec.\n");
+               return;
+       }

 
        argv[1] = path;
 
        DEBUG(2, "Exec to upgraded now\n");
        if (wdt_fd) {
 
        argv[1] = path;
 
        DEBUG(2, "Exec to upgraded now\n");
        if (wdt_fd) {

-               watchdog_no_cloexec();
+               watchdog_set_cloexec(false);

                setenv("WDTFD", wdt_fd, 1);
        }
        execvp(argv[0], argv);
                setenv("WDTFD", wdt_fd, 1);
        }
        execvp(argv[0], argv);

+
+       /* Cleanup on failure */
+       fprintf(stderr, "Failed to exec upgraded.\n");
+       unsetenv("WDTFD");
+       watchdog_set_cloexec(true);
+       chroot(".");

 }
 
 static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,


@@ -378,11 +391,11 @@ static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj,
                return UBUS_STATUS_INVALID_ARGUMENT;
 
        blobmsg_parse(sysupgrade_policy, __SYSUPGRADE_MAX, tb, blob_data(msg), blob_len(msg));
                return UBUS_STATUS_INVALID_ARGUMENT;
 
        blobmsg_parse(sysupgrade_policy, __SYSUPGRADE_MAX, tb, blob_data(msg), blob_len(msg));

-       if (!tb[SYSUPGRADE_PATH])
+       if (!tb[SYSUPGRADE_PATH] || !tb[SYSUPGRADE_PREFIX])

                return UBUS_STATUS_INVALID_ARGUMENT;
 
                return UBUS_STATUS_INVALID_ARGUMENT;
 

-       procd_spawn_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PATH]));
-       fprintf(stderr, "Yikees, something went wrong. no /sbin/upgraded ?\n");
+       procd_exec_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PREFIX]),
+                           blobmsg_get_string(tb[SYSUPGRADE_PATH]));

        return 0;
 }
 
        return 0;
 }