Skip to content

jail: mount ucode related bits into netifd jail #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhewg wants to merge 4 commits into
base: main
Choose a base branch
from
+11 −4
Open

jail: mount ucode related bits into netifd jail #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1454195
jail: mount ucode related bits into netifd jail
dhewg Apr 12, 2026
1b1b535
instance: disable console logging
dhewg Apr 12, 2026
87f9a6c
jail: mount tools used by dhcp.sh in the netifd jail
dhewg Apr 13, 2026
bd39eda
jail: fix reading the oci device gid value
dhewg Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jail/jail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2043,7 +2043,7 @@ static const struct blobmsg_policy oci_devices_policy[] = {
[OCI_DEVICES_MINOR] = { "minor", BLOBMSG_TYPE_INT32 },
[OCI_DEVICES_FILEMODE] = { "fileMode", BLOBMSG_TYPE_INT32 },
[OCI_DEVICES_UID] = { "uid", BLOBMSG_TYPE_INT32 },
[OCI_DEVICES_GID] = { "uid", BLOBMSG_TYPE_INT32 },
[OCI_DEVICES_GID] = { "gid", BLOBMSG_TYPE_INT32 },
};

static mode_t resolve_devtype(char *tstr)
Expand Down
9 changes: 8 additions & 1 deletion jail/netifd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,18 @@ static void run_netifd(struct uloop_timeout *t)
blobmsg_add_string(&req, "/lib/netifd", "0");
blobmsg_add_string(&req, "/lib/network", "0");
blobmsg_add_string(&req, "/usr/bin/awk", "0");
blobmsg_add_string(&req, "/usr/bin/cut", "0");
blobmsg_add_string(&req, "/usr/bin/jshn", "0");
blobmsg_add_string(&req, "/usr/bin/killall", "0");
blobmsg_add_string(&req, "/usr/bin/logger", "0");
blobmsg_add_string(&req, "/usr/bin/jshn", "0");
blobmsg_add_string(&req, "/usr/bin/md5sum", "0");
blobmsg_add_string(&req, "/usr/bin/ucode", "0");
blobmsg_add_string(&req, "/usr/lib/ucode", "0");
blobmsg_add_string(&req, "/usr/share/libubox/jshn.sh", "0");
blobmsg_add_string(&req, "/usr/share/schema", "0");
blobmsg_add_string(&req, "/usr/share/ucode/wifi", "0");
blobmsg_add_string(&req, "/sbin/hotplug-call", "0");
blobmsg_add_string(&req, "/sbin/uci", "0");
blobmsg_add_string(&req, "/sbin/udhcpc", "0");
blobmsg_close_table(&req, mount);

Expand Down
4 changes: 2 additions & 2 deletions service/instance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ instance_console(struct ustream *s, int bytes)
if (!buf)
break;

ulog(LOG_INFO, "out: %s\n", buf);
DEBUG(LOG_INFO, "out: %s\n", buf);

/* test if console client is attached */
if (in->console_client.fd.fd > -1)
Expand All @@ -781,7 +781,7 @@ instance_console_client(struct ustream *s, int bytes)
if (!buf)
break;

ulog(LOG_INFO, "in: %s\n", buf);
DEBUG(LOG_INFO, "in: %s\n", buf);
ustream_write(&in->console.stream, buf, len, false);
ustream_consume(s, len);
} while (1);
Expand Down