enum {
SYSUPGRADE_PATH,
+ SYSUPGRADE_PREFIX,
+ SYSUPGRADE_COMMAND,
__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 },
+ [SYSUPGRADE_COMMAND] = { .name = "command", .type = BLOBMSG_TYPE_STRING },
};
static void
-procd_spawn_upgraded(char *path)
+procd_exec_upgraded(const char *prefix, char *path, char *command)
{
char *wdt_fd = watchdog_fd();
- char *argv[] = { "/tmp/upgraded", NULL, NULL};
+ char *argv[] = { "/sbin/upgraded", NULL, NULL, NULL};
+
+ if (chroot(prefix)) {
+ fprintf(stderr, "Failed to chroot for upgraded exec.\n");
+ return;
+ }
argv[1] = path;
+ argv[2] = command;
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);
+
+ /* 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,
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;
- 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]),
+ tb[SYSUPGRADE_COMMAND] ? blobmsg_get_string(tb[SYSUPGRADE_COMMAND]) : NULL);
return 0;
}