INSTANCE_ATTR_USER,
INSTANCE_ATTR_STDOUT,
INSTANCE_ATTR_STDERR,
+ INSTANCE_ATTR_NO_NEW_PRIVS,
INSTANCE_ATTR_JAIL,
INSTANCE_ATTR_TRACE,
INSTANCE_ATTR_SECCOMP,
[INSTANCE_ATTR_USER] = { "user", BLOBMSG_TYPE_STRING },
[INSTANCE_ATTR_STDOUT] = { "stdout", BLOBMSG_TYPE_BOOL },
[INSTANCE_ATTR_STDERR] = { "stderr", BLOBMSG_TYPE_BOOL },
+ [INSTANCE_ATTR_NO_NEW_PRIVS] = { "no_new_privs", BLOBMSG_TYPE_BOOL },
[INSTANCE_ATTR_JAIL] = { "jail", BLOBMSG_TYPE_TABLE },
[INSTANCE_ATTR_TRACE] = { "trace", BLOBMSG_TYPE_BOOL },
[INSTANCE_ATTR_SECCOMP] = { "seccomp", BLOBMSG_TYPE_STRING },
enum {
JAIL_ATTR_NAME,
- JAIL_ATTR_ROOT,
+ JAIL_ATTR_HOSTNAME,
JAIL_ATTR_PROCFS,
JAIL_ATTR_SYSFS,
JAIL_ATTR_UBUS,
JAIL_ATTR_LOG,
+ JAIL_ATTR_RONLY,
JAIL_ATTR_MOUNT,
__JAIL_ATTR_MAX,
};
static const struct blobmsg_policy jail_attr[__JAIL_ATTR_MAX] = {
[JAIL_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
- [JAIL_ATTR_ROOT] = { "root", BLOBMSG_TYPE_STRING },
+ [JAIL_ATTR_HOSTNAME] = { "hostname", BLOBMSG_TYPE_STRING },
[JAIL_ATTR_PROCFS] = { "procfs", BLOBMSG_TYPE_BOOL },
[JAIL_ATTR_SYSFS] = { "sysfs", BLOBMSG_TYPE_BOOL },
[JAIL_ATTR_UBUS] = { "ubus", BLOBMSG_TYPE_BOOL },
[JAIL_ATTR_LOG] = { "log", BLOBMSG_TYPE_BOOL },
+ [JAIL_ATTR_RONLY] = { "ronly", BLOBMSG_TYPE_BOOL },
[JAIL_ATTR_MOUNT] = { "mount", BLOBMSG_TYPE_TABLE },
};
argv[argc++] = jail->name;
}
- if (jail->root) {
- argv[argc++] = "-P";
- argv[argc++] = jail->root;
+ if (jail->hostname) {
+ argv[argc++] = "-h";
+ argv[argc++] = jail->hostname;
}
if (in->seccomp) {
argv[argc++] = in->seccomp;
}
+ if (in->no_new_privs)
+ argv[argc++] = "-c";
+
if (jail->procfs)
argv[argc++] = "-p";
if (jail->log)
argv[argc++] = "-l";
+ if (jail->ronly)
+ argv[argc++] = "-o";
+
blobmsg_list_for_each(&jail->mount, var) {
const char *type = blobmsg_data(var->data);
jail->name = blobmsg_get_string(tb[JAIL_ATTR_NAME]);
jail->argc += 2;
}
- if (tb[JAIL_ATTR_ROOT]) {
- jail->root = blobmsg_get_string(tb[JAIL_ATTR_ROOT]);
+ if (tb[JAIL_ATTR_HOSTNAME]) {
+ jail->hostname = blobmsg_get_string(tb[JAIL_ATTR_HOSTNAME]);
jail->argc += 2;
}
if (tb[JAIL_ATTR_PROCFS]) {
jail->log = blobmsg_get_bool(tb[JAIL_ATTR_LOG]);
jail->argc++;
}
+ if (tb[JAIL_ATTR_RONLY]) {
+ jail->ronly = blobmsg_get_bool(tb[JAIL_ATTR_RONLY]);
+ jail->argc++;
+ }
if (tb[JAIL_ATTR_MOUNT]) {
struct blob_attr *cur;
int rem;
if (tb[INSTANCE_ATTR_TRACE])
in->trace = blobmsg_get_bool(tb[INSTANCE_ATTR_TRACE]);
+ if (tb[INSTANCE_ATTR_NO_NEW_PRIVS])
+ in->no_new_privs = blobmsg_get_bool(tb[INSTANCE_ATTR_NO_NEW_PRIVS]);
+
if (!in->trace && tb[INSTANCE_ATTR_SECCOMP]) {
char *seccomp = blobmsg_get_string(tb[INSTANCE_ATTR_SECCOMP]);
struct stat s;
if (in->trace)
blobmsg_add_u8(b, "trace", true);
+ if (in->no_new_privs)
+ blobmsg_add_u8(b, "no_new_privs", true);
+
if (in->seccomp)
blobmsg_add_string(b, "seccomp", in->seccomp);
void *r = blobmsg_open_table(b, "jail");
if (in->jail.name)
blobmsg_add_string(b, "name", in->jail.name);
- if (in->jail.root)
- blobmsg_add_string(b, "root", in->jail.root);
+ if (in->jail.hostname)
+ blobmsg_add_string(b, "hostname", in->jail.hostname);
blobmsg_add_u8(b, "procfs", in->jail.procfs);
blobmsg_add_u8(b, "sysfs", in->jail.sysfs);
blobmsg_add_u8(b, "ubus", in->jail.ubus);
blobmsg_add_u8(b, "log", in->jail.log);
+ blobmsg_add_u8(b, "ronly", in->jail.ronly);
blobmsg_close_table(b, r);
if (!avl_is_empty(&in->jail.mount.avl)) {
struct blobmsg_list_node *var;