dbus: fixes from a code review of the branch

A pass over the whole branch before merge, mostly in libink since
that is the new code and the part exposed to the wire.  Grouped here
rather than scattered so the review is easy to read in one place.

libink parser and dispatch:

 - Bound reader lengths so a 32-bit size_t can't wrap a wire length
   past the guard and read out of bounds.  Reachable pre-auth on any
   bus, so it matters on the 32-bit targets Finit runs on.
 - Drop a peer when a reply send fails instead of limping on with a
   half-written frame; a built-in whose send failed used to fall
   through and put a second frame on the wire.

initctl:

 - Copy a D-Bus error name out of the reply before closing the client;
   the reply points into memory the close frees.  Both error paths now
   share one helper so this can't creep back.

Authorization:

 - Take the caller's groups from the kernel (SO_PEERCRED plus
   SO_PEERGROUPS) rather than getpwuid()/getgrouplist(), which go
   through NSS and can block PID 1 on a slow LDAP or SSSD backend.
   The check is now a lookup against the group resolved once at init,
   with no NSS and no 256 KiB array on the stack.  A caller reaching
   us through a broker carries no group set, so system-bus privileged
   methods are root-only; the local bus keeps group support.  See
   libink/README.md for the note on lifting that.

Shutdown:

 - Call dbus_exit() from the shutdown path so the server, its peers,
   and the socket are let go cleanly.  The teardown existed but nobody
   called it.

Tests, CI, docs:

 - A fuzz target for the message parser, run as a quick sweep in the
   suite and properly under libFuzzer in CI, with the corpus carried
   between runs.  The -as-uid tests drop groups the way a login does
   so SO_PEERGROUPS sees the right set, and widen the test socket to
   reach the per-method check behind the 0660 gate.  Bring the GitHub
   actions up to versions that run on Node 24, and tidy a few small
   things a /simplify pass turned up.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2026-08-16 08:57:38 +02:00
1 parent e62b463852
commit 3231ade38a
24 files changed
+266 -108

No files matched your search

+8
View File
@@ -28,6 +28,12 @@ typedef enum {
#define LINK_MATCH_RULE_MAX 256 /* per-peer match rule cap */
#define LINK_MATCH_PEER_CAP 16 /* max active match rules per peer */
#define LINK_PENDING_CAP 4 /* outbound calls awaiting a reply */
/* Primary gid plus supplementary groups captured from SO_PEERGROUPS at
* accept, so the authorizer can answer group membership without an NSS
* lookup in PID 1. A peer in more groups than this keeps only its
* primary gid (see link_server_accept), which fails closed. 32 covers
* a normal login; a directory environment can exceed it. */
#define LINK_PEER_GROUPS_MAX 32
/* Staging for an outgoing method call. Generous on purpose: headers
* for the calls libink makes run to ~150 B, and both the synchronous
* and the connection-side path build into these, so one answer rather
@@ -142,6 +148,8 @@ struct link_match {
struct link_connection {
int fd;
uid_t peer_uid;
gid_t peer_groups[LINK_PEER_GROUPS_MAX];
int peer_ngroups; /* 0 until captured at accept */
char guid[33];
char unique_name[LINK_UNIQUE_NAME_LEN]; /* ":1.N" */