init: /protocol replaces the ServiceId registry
A protocol is reached by name now, not by a compile-time integer. Init is PID 1 and already knows which binary it started, so init serves /protocol as a vfs backend: bind claims a contract with the provider's endpoint attached, open answers with that endpoint as the reply's capability, and readdir lists what is bound with the task and binary behind it. The kernel reserves the prefix — nothing may mount over it, under it, or unmount it — and ServiceId, ipc_register and ipc_lookup are gone, their syscall numbers left vacant. A bind is authorized by who the caller *is*: the kernel-stamped binary together with the supervising task's identity, matched against /system/configuration/protocol.csv. Identity, not spelling — spawn is ungated, so an attacker can run any bundled binary, and a name-only rule would have let it launder grants through an init of its own making. A name a live process holds is refused to everyone else; a dead one's is released. Three review rounds against a hostile ring-3 process found what 108 green tests could not, because the suite contains no attacker. Publishing init's supervision endpoint as the registry put PID 1's mailbox in every process's hands, where two forged bytes reached the shutdown path: privileged traffic is now believed only from the task that holds the contract it speaks for. A capability arriving on a request outlived every path that ignored it, one handle per call until the table was full — in init, and in the harness ten services share — so the arriving capability is owned by the turn and released unless a handler says otherwise. And the kernel let anyone holding an endpoint handle aim signals, timers, exit notices and interrupts at it: binding now requires having created it. Suite 108/108. The new protocol-registry case asserts eleven properties, each one an attack that must fail.
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
|
||||
const std = @import("std");
|
||||
const device = @import("driver");
|
||||
const channel = @import("channel");
|
||||
const ipc = @import("ipc");
|
||||
const process = @import("process");
|
||||
const service = @import("service");
|
||||
@@ -189,14 +190,32 @@ pub fn main(init: process.Init) void {
|
||||
readFadt(fadt);
|
||||
s5_valid = readSleepS5(&persistent_namespace);
|
||||
|
||||
// Every name this service needs, resolved before it becomes a provider — see
|
||||
// `manager_channel`. Best-effort, as it has always been: a standalone
|
||||
// bring-up with no device manager still serves power.
|
||||
manager_channel = channel.openEndpoint("device-manager");
|
||||
|
||||
service.run(power_protocol.message_maximum, .{
|
||||
.service = .power,
|
||||
.service = "power",
|
||||
.init = onInit,
|
||||
.on_message = onMessage,
|
||||
.on_notification = onNotification,
|
||||
});
|
||||
}
|
||||
|
||||
/// The device manager's channel, opened **before** this service binds its own
|
||||
/// contract — deliberately, and load-bearing.
|
||||
///
|
||||
/// init is the registrar, and init is also this service's one subscriber: the
|
||||
/// moment `power` is bound, init calls us to subscribe. init has a single thread,
|
||||
/// so while it is blocked in that call it cannot answer anyone — including us. If
|
||||
/// we opened a name after binding, the two could cross: init blocked calling us,
|
||||
/// us blocked asking init to resolve a name, neither ever replying. Resolving
|
||||
/// everything we need first makes that impossible, because after the bind this
|
||||
/// service only ever talks to the device manager (which never calls init) and
|
||||
/// then parks in the harness loop, where init's subscribe lands.
|
||||
var manager_channel: ?ipc.Handle = null;
|
||||
|
||||
// Static so the harness callbacks (which run after main's stack frame is gone)
|
||||
// can reach the namespace and interpreter.
|
||||
var persistent_namespace: aml.Namespace = undefined;
|
||||
@@ -209,7 +228,7 @@ fn onInit(endpoint: ipc.Handle) bool {
|
||||
registered_count = 0;
|
||||
walkDevices(persistent_namespace.root, &global_interpreter);
|
||||
|
||||
const manager = ipc.lookup(.device_manager);
|
||||
const manager = manager_channel;
|
||||
var i: usize = 0;
|
||||
while (i < registered_count) : (i += 1) {
|
||||
const entry = registered[i];
|
||||
@@ -433,15 +452,17 @@ fn onNotification(badge: u64) void {
|
||||
/// The `.power` protocol: subscribe (endpoint as the call's capability),
|
||||
/// shutdown (PID 1 only). Device discovery uses a different endpoint (the
|
||||
/// device manager's), so nothing here handles ChildAdded.
|
||||
fn onMessage(message: []const u8, reply: []u8, sender: u32, capability: ?ipc.Handle) usize {
|
||||
fn onMessage(message: []const u8, reply: []u8, sender: u32, arrived: *ipc.Arrival) usize {
|
||||
if (message.len < 1) return 0;
|
||||
switch (message[0]) {
|
||||
@intFromEnum(power_protocol.Operation.subscribe) => {
|
||||
// The subscriber's endpoint is claimed only when a slot takes it;
|
||||
// a full table refuses and the turn closes what arrived.
|
||||
var status: i32 = -1;
|
||||
if (capability) |handle| {
|
||||
if (arrived.peek() != null) {
|
||||
for (&subscribers, 0..) |*slot, si| {
|
||||
if (slot.* == null) {
|
||||
slot.* = handle;
|
||||
slot.* = arrived.take();
|
||||
subscriber_tasks[si] = sender;
|
||||
status = 0;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user