A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix(rootfs): harden guest helper allocations and listener bind
ExTv5405f9c1164d
diff --git a/build-rootfs/host-bridge/podroid-hostd.c b/build-rootfs/host-bridge/podroid-hostd.cindex 8a7358a..950eb01 100644--- a/build-rootfs/host-bridge/podroid-hostd.c+++ b/build-rootfs/host-bridge/podroid-hostd.c@@ -212,11 +212,20 @@ static int cli_notify(int argc, char **argv) {if (i >= argc) { fprintf(stderr, "usage: podroid-notify [--title T] [--priority low|normal|high] [--id N] BODY\n"); return 2; }size_t blen = 0;for (int j = i; j < argc; j++) blen += strlen(argv[j]) + 1;- char *body = malloc(blen + 1); body[0] = '\0';+ char *body = malloc(blen + 1);+ if (!body) { fprintf(stderr, "podroid: out of memory\n"); return 1; }+ body[0] = '\0';for (int j = i; j < argc; j++) { if (j > i) strcat(body, " "); strcat(body, argv[j]); }char *b64title = title ? b64encode((const unsigned char *)title, strlen(title)) : NULL;char *b64body = b64encode((const unsigned char *)body, strlen(body));+ /* b64body is required; a NULL (allocation failure) must not reach snprintf's+ * %s. The title is optional and already falls back to the "-" sentinel. */+ if (!b64body) {+ fprintf(stderr, "podroid: out of memory\n");+ free(body); free(b64title);+ return 1;+ }char req[8192];int reqlen = snprintf(req, sizeof(req), "NOTIFY %s %s %s %s",prio, id, b64title ? b64title : "-", b64body);diff --git a/build-rootfs/vsock-agent/podroid-vsock-agent.c b/build-rootfs/vsock-agent/podroid-vsock-agent.cindex 4f22b32..ada3538 100644--- a/build-rootfs/vsock-agent/podroid-vsock-agent.c+++ b/build-rootfs/vsock-agent/podroid-vsock-agent.c@@ -332,13 +332,21 @@ static int tcp_connect(const char *host, int port) {return s;}-/* Forks the parent off — this function never returns in the child. */-static void tcp_listener_main(int vport, const char *host, int gport) {+/* Forks the parent off — this function never returns in the child. sync_fd is+ * the write end of a pipe the parent reads to learn whether bind/listen+ * succeeded before it advertises this forward. */+static void tcp_listener_main(int vport, const char *host, int gport, int sync_fd) {/* New process group rooted at this listener's PID. Splice children forked* below inherit it, so REMOVE can kill(-pgid) the listener AND every* in-flight connection in one shot. setpgid(0,0) makes pgid == our pid. */setpgid(0, 0);int s = vsock_listen(vport);+ /* Report the bind/listen result to the parent before it records the+ * {vport,pid} row: a failure (e.g. EADDRINUSE in a fast remove-then-add)+ * must not advertise a listener that isn't actually accepting. */+ char ok = (s < 0) ? 0 : 1;+ if (write(sync_fd, &ok, 1) != 1) { /* parent gone; nothing to do */ }+ close(sync_fd);if (s < 0) _exit(1);/* Drop fds inherited from the parent that this listener has no use for: the* ctl listening socket, and (when forked from a live handle_add) the ctl@@ -461,10 +469,14 @@ static void udp_relay(int vsock_fd, const char *host, int gport) {close(vsock_fd);}-/* Forks the parent off — this function never returns in the child. */-static void udp_listener_main(int vport, const char *host, int gport) {+/* Forks the parent off — this function never returns in the child. sync_fd+ * carries the bind/listen result back to the parent (see tcp_listener_main). */+static void udp_listener_main(int vport, const char *host, int gport, int sync_fd) {setpgid(0, 0);int s = vsock_listen(vport);+ char ok = (s < 0) ? 0 : 1;+ if (write(sync_fd, &ok, 1) != 1) { /* parent gone; nothing to do */ }+ close(sync_fd);if (s < 0) _exit(1);close_inherited_fds(s);LOG_I("udp listener: vsock:%d → %s:%d", vport, host, gport);@@ -491,11 +503,31 @@ static int spawn_listener(int vport, const char *host, int gport, int is_udp) {if (pid_alive(listeners[idx].pid)) return 0; // already runninglistener_remove(idx); // stale row for a dead listener — drop and respawn}+ /* Sync pipe: the child reports its bind/listen result so we record the+ * {vport,pid} row only once the listener is actually accepting. */+ int sync_pipe[2];+ if (pipe(sync_pipe) < 0) {+ LOG_E("spawn vsock:%d pipe() failed: %s", vport, strerror(errno));+ return -1;+ }pid_t pid = fork();- if (pid < 0) return -1;+ if (pid < 0) { close(sync_pipe[0]); close(sync_pipe[1]); return -1; }if (pid == 0) {- if (is_udp) udp_listener_main(vport, host, gport); // never returns- else tcp_listener_main(vport, host, gport); // never returns+ close(sync_pipe[0]); // child keeps only the write end+ if (is_udp) udp_listener_main(vport, host, gport, sync_pipe[1]); // never returns+ else tcp_listener_main(vport, host, gport, sync_pipe[1]); // never returns+ _exit(127); // defensive: the *_listener_main calls never return+ }+ close(sync_pipe[1]); // parent keeps the read end; the child is the sole writer+ char ok = 0;+ ssize_t n = read(sync_pipe[0], &ok, 1);+ close(sync_pipe[0]);+ if (n != 1 || ok != 1) {+ /* Bind/listen failed: the child has already exited (or is exiting). Don't+ * advertise it and don't signal pid — it may be reaped and its pid+ * recycled (see handle_remove); the SIGCHLD handler reaps the child. */+ LOG_W("spawn vsock:%d: listener did not come up", vport);+ return -1;}setpgid(pid, pid);if (listener_add(vport, pid) < 0) {