From nobody Fri Sep 25 09:26:24 2026 Received: from mail-yx1-f45.google.com (mail-yx1-f45.google.com [74.125.224.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0F32443C0F for ; Mon, 14 Sep 2026 16:42:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789404125; cv=none; b=HpA9jvLWKhpqwsUitCUXa4i0BkypuBIB5vWcqHQlek1wZ3EhdM/SeYLT7kD9ykA3Du7zLRpa4IhzSl+UrxlZHv6RlpBw/zW6j0XUkDwJLkbZfBS4Bh3ZB96VuwPiBRY0HL6pluNNjkgEzkt5gp6ub/av/qFLbqEIe7xlyrOh1C4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789404125; c=relaxed/simple; bh=+N9ZKaZxeybEwISedHcLFR5weaHCuqwm361zoPMxU4M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LxjApIEyCnw00p0REfBGgBDQIyfsoNo52Jq3jmzeDuKK5RktL4QvnncSNKOaWb7uLzJU3q5U6VT8G/q1g7iHmz5Asvr+MIwm18P6T3h3uQhwh0QtRQUDyVd83NyKoqqaBt8KrMb677Qf+kOB0lTPHZQGKJsVaL2rgHue98egXFc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com; spf=pass smtp.mailfrom=amutable.com; dkim=pass (2048-bit key) header.d=amutable-com.20251104.gappssmtp.com header.i=@amutable-com.20251104.gappssmtp.com header.b=WO9bU0iX; arc=none smtp.client-ip=74.125.224.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amutable.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amutable-com.20251104.gappssmtp.com header.i=@amutable-com.20251104.gappssmtp.com header.b="WO9bU0iX" Received: by mail-yx1-f45.google.com with SMTP id 956f58d0204a3-671061b015eso3652320d50.1 for ; Mon, 14 Sep 2026 09:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amutable-com.20251104.gappssmtp.com; s=20251104; t=1789404122; x=1790008922; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=SfEDwKZx2Ac2Zov3iFEW2DHPNztOR7nlXE153PDtqAw=; b=WO9bU0iXJcOVnCevtYrA5YksA5xFDXQ33CN3bwdR5wFYR3c398KJiptiBuY0ULyzCZ VcErnYSK+FGhwrruzXoMb0SG9cgAyv/JZ+AmjramI9rYv34AzMHMrnuv0O68jz9Lyh2C e1bFg3Nb90skmXYQx4dX4+/t/ztlH7j17ezNUkxeudEi8jDYQtyt2dCGTMKRB5XXZnCS ACByqlzdtrGsqbKRKHfpsegxqgyiBWyLNJFnijxj+BVjbMjeUlr9+Az/eGYT8nmKYeEw vzQFjZSxzdnugfHpf3NRdR2TWpLDE7hf1OgpeJu9rqYc+HG9JqXYqvsLYmB00TC2Rmpq EICQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789404122; x=1790008922; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=SfEDwKZx2Ac2Zov3iFEW2DHPNztOR7nlXE153PDtqAw=; b=mxmUhkDDyKRizh8lPLiv5rHbNPxbOBP3TF5K7C6vimeMSQrTNzrj5BILtdksH9ysTN Xu4QT8RnjmvkDLdvNZVJnxHM44GYa1MnBYWTuPweQDVhSucT+IQBAJFBcYTQSRhpHIdM Is4gwgoP8mBUvs2CFpAGLhch/tC7fD4xp8JEm7AFnz1MtnCr2ezOk933+Xi7goybMIP+ +gikqd6m10Mn4Vt8xjZM4exd0qVsXFlIY2Hzx/rx9odyfE7LN6psHl2YzTlQE5UTKK9c ijYV0h3IKxsyQVAriCdFGTRSxMX+kAfNRzuH9uuMQMzGESoF0xQY88RnymPxP5kUz/SU 83nA== X-Forwarded-Encrypted: i=1; AKwUvBztKXGscjai05FQObIrodhz9nRn26L0SwpVkwZMAjhJ6rj8boAHm5Txq0oxgfC5mc2ojiTrI6cNK/G2QzM=@vger.kernel.org X-Gm-Message-State: AFuF++mbiJT8H5cE8PI5b83hDnrVCFL/O6eStyXjg6BvbI+C7QkVtors 0Gg11jR4IRr/rTSTDubkOs6UvToP4EmY4uKDGI6cENUKhQkiu4PPftIjq9LfwnSHnx8m X-Gm-Gg: AYBFou0BzWCNMK+tG7GJY2GWejI3W8GdKdwRZXEgNNih2p7Qyd/vGeZKsv6BCf4BLW0 /ieX4H1AmBsV/vXs21SkVjOPmm4fCWkpXGiazIPFdef5Jgdi9vrEibh+CRnvXncYndxT5pAYV/W svWHCv8Fmtq4gkmsa9eBpLgwY5ncLFclYLkalkne51keWUiWMtVI4xvpI5d0QiYr1/808n/JCv8 jcPAXhtuvFyBJ0JAO0xBbfHwrZxwXaVpWgB7Zwl3f5gtX+QQHDF/GXSqYqR7UsvPWWE18tNy9dS ennu5KojeMeSRFpWz1w35j3szE6L1J/pSFXaVRfNQ6rWLEfU7ir7be4FGa3TAfCnLvPLiLWuPWq BVNFdpDKmHT7AFn3RN4oijoP9wiwDbZFbuu0lf+v0DsqHLTLdzQ/IB4ZAAGSYL8PI35hFCIx64G ftpHtKPU5Jgc1PJGGAXcL0QBFQ2RE/TYhuILrqfg9c6Hf6coYy+2KKBTlUwqXOaw== X-Received: by 2002:a53:ac83:0:b0:66f:c1bc:c097 with SMTP id 956f58d0204a3-6714e1a194cmr1022205d50.95.1789404121718; Mon, 14 Sep 2026 09:42:01 -0700 (PDT) Received: from [192.168.1.110] ([2600:1700:1ff0:d0ef::d15]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-67125df42a8sm4879023d50.8.2026.09.14.09.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 09:42:01 -0700 (PDT) From: Andrew Halaney Date: Mon, 14 Sep 2026 11:41:42 -0500 Subject: [PATCH 1/3] keys: add KEY_SPEC_DM_VERITY_KEYRING Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-ajhalaney-dmverity-key-identifier-v1-1-01922dc1366a@amutable.com> References: <20260914-ajhalaney-dmverity-key-identifier-v1-0-01922dc1366a@amutable.com> In-Reply-To: <20260914-ajhalaney-dmverity-key-identifier-v1-0-01922dc1366a@amutable.com> To: Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , David Howells , Jarkko Sakkinen , Paul Moore , James Morris , "Serge E. Hallyn" , Eric Biggers , "Theodore Y. Ts'o" , Jonathan Corbet , Shuah Khan , Randy Dunlap Cc: dm-devel@lists.linux.dev, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, bpf@vger.kernel.org, fsverity@lists.linux.dev, linux-doc@vger.kernel.org, Andrew Halaney , "Christian Brauner (Amutable)" X-Mailer: b4 0.14.3 The .dm-verity keyring is not linked into any process keyring, so request_key() and KEYCTL_SEARCH cannot find it. Userspace has to scrape /proc/keys for the serial to use. That's not great, one could put in a bogus description containing a newline to confuse userspace further. For example, thanks to AI models, which I run as root but you could show off as any old user: # DESC=3D$'.dm-verity: 1\n0badf00d I--Q--- 1 perm 082f0000 0 = 0 keyring .dm-verity' # k=3D$(echo -n "1234567" | keyctl padd user "$DESC" @s) # keyctl setperm "$k" 0x3f010001 # cat /proc/keys | grep dm-verity 10402023 I------ 2 perm 082f0000 0 0 keyring .dm-verity: = empty 12e0bee6 I--Q--- 1 perm 3f010001 0 0 user .dm-verity: 1 0badf00d I--Q--- 1 perm 082f0000 0 0 keyring .dm-verity: 7 0x0badf00d is not a keyring, it is the text inside our user's key description. Telling the two apart needs a KEYCTL_DESCRIBE per row which is annoying to do. i.e.: # keyctl rdescribe 0x10402023 keyring;0;0;082f0000;.dm-verity # keyctl rdescribe 0x0badf00d keyctl_describe: Required key not available Let's just give it a well known identifier, i.e.: # keyctl rdescribe -10 keyring;0;0;082f0000;.dm-verity This is exactly what commit 264d8fd2794f ("bpf, keys: Add a bpf keyring for program signature va= lidation") did, and was the inspiration for this commit minus the spinlock bits required due to dm-verity being a module. Suggested-by: Christian Brauner (Amutable) Signed-off-by: Andrew Halaney Reviewed-by: Christian Brauner (Amutable) Reviewed-by: Jarkko Sakkinen --- drivers/md/dm-verity-verify-sig.c | 3 +++ include/linux/key.h | 1 + include/uapi/linux/keyctl.h | 1 + security/keys/process_keys.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/drivers/md/dm-verity-verify-sig.c b/drivers/md/dm-verity-verif= y-sig.c index b2b55c41e2cb..da509dcdd7e5 100644 --- a/drivers/md/dm-verity-verify-sig.c +++ b/drivers/md/dm-verity-verify-sig.c @@ -189,11 +189,14 @@ int __init dm_verity_verify_sig_init(void) keyring_restrict(make_key_ref(dm_verity_keyring, true), NULL, NULL)) panic("dm-verity can't seal keyring\n"); =20 + key_register_dm_verity_keyring(dm_verity_keyring); + return 0; } =20 void dm_verity_verify_sig_exit(void) { + key_register_dm_verity_keyring(NULL); key_revoke(dm_verity_keyring); key_put(dm_verity_keyring); } diff --git a/include/linux/key.h b/include/linux/key.h index bd10fe45819d..ae8d3314fd93 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -441,6 +441,7 @@ extern int keyring_restrict(key_ref_t keyring, const ch= ar *type, const char *restriction); =20 extern void key_register_bpf_keyring(struct key *keyring); +extern void key_register_dm_verity_keyring(struct key *keyring); =20 extern struct key *key_lookup(key_serial_t id); =20 diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index fa85b9760391..75923941f1b3 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h @@ -25,6 +25,7 @@ #define KEY_SPEC_REQKEY_AUTH_KEY -7 /* - key ID for assumed request_key au= th key */ #define KEY_SPEC_REQUESTOR_KEYRING -8 /* - key ID for request_key() dest k= eyring */ #define KEY_SPEC_BPF_KEYRING -9 /* - key ID for the BPF-specific keyring = */ +#define KEY_SPEC_DM_VERITY_KEYRING -10 /* - key ID for the .dm-verity keyr= ing */ =20 /* request-key default keyrings */ #define KEY_REQKEY_DEFL_NO_CHANGE -1 diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 44358388e395..dba3df41638b 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -25,6 +25,10 @@ static DEFINE_MUTEX(key_session_mutex); /* BPF keyring reachable through KEY_SPEC_BPF_KEYRING */ static struct key *bpf_keyring __ro_after_init; =20 +/* dm-verity keyring reachable through KEY_SPEC_DM_VERITY_KEYRING */ +static struct key *dm_verity_keyring; +static DEFINE_SPINLOCK(dm_verity_keyring_lock); + /* The root user's tracking struct */ struct key_user root_key_user =3D { .usage =3D REFCOUNT_INIT(3), @@ -607,6 +611,24 @@ void key_register_bpf_keyring(struct key *keyring) bpf_keyring =3D keyring; } =20 +/** + * key_register_dm_verity_keyring - Publish the keyring for KEY_SPEC_DM_VE= RITY_KEYRING + * @keyring: The keyring to publish, or NULL to withdraw it + * + * Make @keyring reachable by userspace through the KEY_SPEC_DM_VERITY_KEY= RING + * special key ID, so that provisioning it does not require scraping its + * serial out of /proc/keys first. dm-verity can be unloaded as a module + * and the keyring deregistered, as such serialize access with + * dm_verity_keyring_lock. + */ +void key_register_dm_verity_keyring(struct key *keyring) +{ + spin_lock(&dm_verity_keyring_lock); + dm_verity_keyring =3D keyring; + spin_unlock(&dm_verity_keyring_lock); +} +EXPORT_SYMBOL_GPL(key_register_dm_verity_keyring); + /* * Look up a key ID given us by userspace with a given permissions mask to= get * the key it refers to. @@ -766,6 +788,17 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned lo= ng lflags, key_ref =3D make_key_ref(key, 0); break; =20 + case KEY_SPEC_DM_VERITY_KEYRING: + spin_lock(&dm_verity_keyring_lock); + key =3D dm_verity_keyring; + if (key) + __key_get(key); + spin_unlock(&dm_verity_keyring_lock); + if (!key) + goto error; + key_ref =3D make_key_ref(key, 0); + break; + default: key_ref =3D ERR_PTR(-EINVAL); if (id < 1) --=20 2.55.0 From nobody Fri Sep 25 09:26:24 2026 Received: from mail-yx2-f12.google.com (mail-yx2-f12.google.com [74.125.224.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 855A348D897 for ; Mon, 14 Sep 2026 16:42:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.140 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789404127; cv=none; b=bfOrQT+QOhKBVyXK6iDALwBdUZsYQwiv8boFvoKPxNgNnE7eBuxkElEJ3fK4T/ueMch6sfi1/lWwNrNf7srN1jDTaCYfwX0P6UwA9i+otkM0cdRlqblBROs4QU4qAx4snWEl5VxCQskPYKQslFE0BYtitl1gtIi6y0csIltXmwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789404127; c=relaxed/simple; bh=zafmxxNjheNFUeJK3AIQJ8pVbd1q5BFmpHhmp6iOmBM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aaLzMPxTjbMsTIjyvti2X7zz3sS2ZXzfA3wxVzbrBo0STMiZM+J01KyyDLfrz2gSrShyaus1TK88gJFl4LDoDU0Wgy6+1pKzXM81Lfc8t/Ure0yetCcEZ7iWY7QnMJnz0mMJEx3pzDovi7Y0FEgkgy5ToGGyrc/BGmMgwadjrbQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com; spf=pass smtp.mailfrom=amutable.com; dkim=pass (2048-bit key) header.d=amutable-com.20251104.gappssmtp.com header.i=@amutable-com.20251104.gappssmtp.com header.b=HJP6SlE9; arc=none smtp.client-ip=74.125.224.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amutable.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amutable-com.20251104.gappssmtp.com header.i=@amutable-com.20251104.gappssmtp.com header.b="HJP6SlE9" Received: by mail-yx2-f12.google.com with SMTP id 956f58d0204a3-66e4ab20a33so2144059d50.1 for ; Mon, 14 Sep 2026 09:42:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amutable-com.20251104.gappssmtp.com; s=20251104; t=1789404123; x=1790008923; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=qFr7b5bBk2c57QN/ffKr2kggj2VzIZRrazmGOtkcSoQ=; b=HJP6SlE9Ko3G5dsx3ikhG/qyJQwXrTQvT4DHlEOSrohajQ4Mh1xEqoP1SN7nnN9hiR L8spXU1ylNlp5NrKGH6JSCdwr4pGEvwdO+UUsXuJ0vx3GV/6blYzUZamXMpLbLTKf/hV 9PHZzBtJqVceZNw1vwZ0EALhCstg0ozpruUB3dnnpKqfh1hmHOhW2F59Bv8vz66uKw84 tA86xsvFe65On7ILwRmUrsxU9a8J5W8rU6hJZm2O6niKRkWRkyDRMA7CJHPfSMNjUpCi FRaXxw/Da4pSsEhjjvUiDCneQqWiGFIhB7ph8yYsNUTI70/8GkEvLGr19hyIh/kYsn3f 5SVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789404123; x=1790008923; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=qFr7b5bBk2c57QN/ffKr2kggj2VzIZRrazmGOtkcSoQ=; b=Ie7a0HytQjbcPeM/v34bWhT1m0qmC1SMAUupR1DFcVaoUhvXOk6rWpIvyeO3R//Bx4 dD7Byrw5BCQKJUV4yBpJG0vYfQ1AdfQBXmuJLLlOqWvDo2M6YuWwxIeHQbhKMamlxCG3 IF0SZXqDkI04iwLyYLic1QjB+WwH8TNdUu25OiLu79N8pOmdRi2U7qLR+0TYUgPqfgd9 6LzYegnpXw5jLM42k6B7lSxbshnWFhFJzzuvw25JAmwzQtU4E0oWzG+rkuYBZW1q3yJi RDXfV7dOqtwKI5c8FqpS/f3CkO6+RzDW1rTcjq9r71PrtXv3FziN/X5DYrL8FVBHflXM doTw== X-Forwarded-Encrypted: i=1; AKwUvBxKF6wdDZtNv7hLBlylb6/xSXFn1kbd6RGW7cBJ2bTVL4cgnrqQw2l+9yx5i6xERRpqJV0MMx9ImFuG0pM=@vger.kernel.org X-Gm-Message-State: AFuF++ntwQIicszDdqlw6vWKUPCL5tSKaUE8TBMfF0ZTByXjpALSAHLA 88NgIR85JMf8D8lyK/cnrjvEgNmDjVV4/7l9HHATCego7wn1Y7qsC6obDReATA7DIc3a X-Gm-Gg: AYBFou2PqKsUfVOKvYlMdp82jTZYC9oHzl0Z64Qlw5q3qNyOEPbikjc9inTn32QxqO7 3UIrQHG8UrYxdh6WChL6dEI2IWebhtmeE4BrrXZXivKyU3js0YscUVkGxvT6w8n+xXbG1qWehBr EUpQlNyqUOomiSxOavm040bR/9KhB4Eir/22v/ZHUlFxgqlOfcx5VNMtPV2EMTMnlrNH5qAjJkd sRAyhLKApYG9EKT2/FBhKskfUdqpzLG6OpL7+jNIeHSiI5wF1aZGCGoR1InKxeH3SGwGC42k2TG kcDu5pbmGibb2R3TZ9ZibqSwOwVLh6fCgpDo78vsQig4wuw7XhlVD8Rmft0mq8t0dDGHDFmC4JR B8jYTrw2XW2IBuD8pL0uCOhY6Gey1sfQ6cRq2KB/0colL/KdOC8ubkoiHtdbzQl2w04VZJ8dmju HTW4dJE4Xp8snmEsmVWx1N75kDn2ABsTaUpqKZ5zrARFYOA1rnNvOLole50TXR X-Received: by 2002:a05:690e:1388:b0:668:1c09:aef1 with SMTP id 956f58d0204a3-6714dfc8bb9mr968611d50.6.1789404122960; Mon, 14 Sep 2026 09:42:02 -0700 (PDT) Received: from [192.168.1.110] ([2600:1700:1ff0:d0ef::d15]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-67125df42a8sm4879023d50.8.2026.09.14.09.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 09:42:02 -0700 (PDT) From: Andrew Halaney Date: Mon, 14 Sep 2026 11:41:43 -0500 Subject: [PATCH 2/3] keys: add KEY_SPEC_FS_VERITY_KEYRING Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-ajhalaney-dmverity-key-identifier-v1-2-01922dc1366a@amutable.com> References: <20260914-ajhalaney-dmverity-key-identifier-v1-0-01922dc1366a@amutable.com> In-Reply-To: <20260914-ajhalaney-dmverity-key-identifier-v1-0-01922dc1366a@amutable.com> To: Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , David Howells , Jarkko Sakkinen , Paul Moore , James Morris , "Serge E. Hallyn" , Eric Biggers , "Theodore Y. Ts'o" , Jonathan Corbet , Shuah Khan , Randy Dunlap Cc: dm-devel@lists.linux.dev, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, bpf@vger.kernel.org, fsverity@lists.linux.dev, linux-doc@vger.kernel.org, Andrew Halaney , "Christian Brauner (Amutable)" X-Mailer: b4 0.14.3 Same problem as the dm-verity keyring: .fs-verity is allocated unlinked, so the only way for userspace to name it is to scrape /proc/keys. Suggested-by: Christian Brauner (Amutable) Signed-off-by: Andrew Halaney Reviewed-by: Christian Brauner (Amutable) --- fs/verity/signature.c | 2 ++ include/linux/key.h | 1 + include/uapi/linux/keyctl.h | 1 + security/keys/process_keys.c | 25 +++++++++++++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/fs/verity/signature.c b/fs/verity/signature.c index 0302a4e506ec..07657e913b22 100644 --- a/fs/verity/signature.c +++ b/fs/verity/signature.c @@ -135,4 +135,6 @@ void __init fsverity_init_signature(void) KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL); if (IS_ERR(fsverity_keyring)) panic("failed to allocate \".fs-verity\" keyring"); + + key_register_fs_verity_keyring(fsverity_keyring); } diff --git a/include/linux/key.h b/include/linux/key.h index ae8d3314fd93..dd386c56278c 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -442,6 +442,7 @@ extern int keyring_restrict(key_ref_t keyring, const ch= ar *type, =20 extern void key_register_bpf_keyring(struct key *keyring); extern void key_register_dm_verity_keyring(struct key *keyring); +extern void key_register_fs_verity_keyring(struct key *keyring); =20 extern struct key *key_lookup(key_serial_t id); =20 diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index 75923941f1b3..00cc0942203e 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h @@ -26,6 +26,7 @@ #define KEY_SPEC_REQUESTOR_KEYRING -8 /* - key ID for request_key() dest k= eyring */ #define KEY_SPEC_BPF_KEYRING -9 /* - key ID for the BPF-specific keyring = */ #define KEY_SPEC_DM_VERITY_KEYRING -10 /* - key ID for the .dm-verity keyr= ing */ +#define KEY_SPEC_FS_VERITY_KEYRING -11 /* - key ID for the .fs-verity keyr= ing */ =20 /* request-key default keyrings */ #define KEY_REQKEY_DEFL_NO_CHANGE -1 diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index dba3df41638b..655c58a96fcb 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -29,6 +29,9 @@ static struct key *bpf_keyring __ro_after_init; static struct key *dm_verity_keyring; static DEFINE_SPINLOCK(dm_verity_keyring_lock); =20 +/* fs-verity keyring reachable through KEY_SPEC_FS_VERITY_KEYRING */ +static struct key *fs_verity_keyring __ro_after_init; + /* The root user's tracking struct */ struct key_user root_key_user =3D { .usage =3D REFCOUNT_INIT(3), @@ -629,6 +632,20 @@ void key_register_dm_verity_keyring(struct key *keyrin= g) } EXPORT_SYMBOL_GPL(key_register_dm_verity_keyring); =20 +/** + * key_register_fs_verity_keyring - Publish the keyring for KEY_SPEC_FS_VE= RITY_KEYRING + * @keyring: The keyring to publish + * + * Make @keyring reachable by userspace through the KEY_SPEC_FS_VERITY_KEY= RING + * special key ID, so that provisioning it does not require scraping its + * serial out of /proc/keys first. Called once, from an initcall, and never + * undone. + */ +void key_register_fs_verity_keyring(struct key *keyring) +{ + fs_verity_keyring =3D keyring; +} + /* * Look up a key ID given us by userspace with a given permissions mask to= get * the key it refers to. @@ -799,6 +816,14 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned lo= ng lflags, key_ref =3D make_key_ref(key, 0); break; =20 + case KEY_SPEC_FS_VERITY_KEYRING: + key =3D fs_verity_keyring; + if (!key) + goto error; + __key_get(key); + key_ref =3D make_key_ref(key, 0); + break; + default: key_ref =3D ERR_PTR(-EINVAL); if (id < 1) --=20 2.55.0 From nobody Fri Sep 25 09:26:24 2026 Received: from mail-yx2-f9.google.com (mail-yx2-f9.google.com [74.125.224.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0182748F839 for ; Mon, 14 Sep 2026 16:42:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.137 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789404129; cv=none; b=DdafCLwSqEszdGRpyPyP0LPCvdcgN4h8I1q8Y1t/cYg4T4MbGvzgkPr1qzhze1DYj1FJfl36uXBI1ITE9pltLX6pif5sPFCPq/gdvdmi110589t6pEEav3e7zkM5lVizbQ9MRTdEhkVcl7zVisy7296NlDVibJOvAjeW5VxE4vg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789404129; c=relaxed/simple; bh=fyPrl3WvozGTDDVsDO8MGVfKnhRCs2T8g6qKeea9uQc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Gfzq4VpDIqa49ZXxv4zomufwVzzPJNOMU/I2R6ASQNC5gCF+EIA6uGSC8DrCpKr27sPWfRyyFiMXIGXYP/+9Nf9G4+mdm9CkcgajvU5vN6wdlyjGS19Kam1KHfBk8TphGNhEzsC+wS5rXLrho851tRkUrpb0/tHEiZjWPQeF4ys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com; spf=pass smtp.mailfrom=amutable.com; dkim=pass (2048-bit key) header.d=amutable-com.20251104.gappssmtp.com header.i=@amutable-com.20251104.gappssmtp.com header.b=f5lMeVgu; arc=none smtp.client-ip=74.125.224.137 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=amutable.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amutable.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amutable-com.20251104.gappssmtp.com header.i=@amutable-com.20251104.gappssmtp.com header.b="f5lMeVgu" Received: by mail-yx2-f9.google.com with SMTP id 956f58d0204a3-66e5f4dc13bso944252d50.1 for ; Mon, 14 Sep 2026 09:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amutable-com.20251104.gappssmtp.com; s=20251104; t=1789404124; x=1790008924; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ndMM0TFrryHnZOvHnxhOWJr9tGmJVwIhyX6o7UKbX40=; b=f5lMeVguGh1mH4Nna49X7IZNiBsDiRwwgHAAwhJRQY+ZByij2jyEx4lsK54K5OA2+e jFm9UiDUQT3kDyC5tHE/XGiNnorfF2b4xKZPEvrPqNyY0+M2Hgz/zCdPva7/qr/9dOOm UfQzb0QXf+wLNVjOK6HTBvlVi0SsMFokmKKGN5+bduK+hDLiRorkhsn+7G7qYXHj2siE beLXJ/xcGk867HZ5ZqoElH6M34ATJo2y9mFIG4m878j12sup1h1i0S/LryjR/yf3yBHv LLAqBHUl72QrDEwXVRhWS0cv2jeK0+wGMdBDFwu3ZMOQ2VNx0SBCK4ibsE4f/lm5Ur4n 6cyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789404124; x=1790008924; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ndMM0TFrryHnZOvHnxhOWJr9tGmJVwIhyX6o7UKbX40=; b=gC6FmIDI5DEiPEVjK6PWj7QJFJUUrfHN9Vr5IDUsxULznjeVQgEx6HN5//LRTbYorp wnGF3zKYiTASij2O6HW80CHIz8mqXRIc21pLlTwv5AMFfHlIZ9oZDj1NrYJ1cbPzdH59 pg2XmvgiuecxcqwntHfyQGfr5DBd1VBq7FgnDxYEP2PiImxgMKDogdkfv5vNfIfwksDS 1EfUOWqb7dkbVj5acbUlDhRz6J5uiZgodNl/R2vE+skE00AKe+fzhUlXKsGjbHdziw6v B4ak5uJy9Cx0PGRfdYA96IeE5EgeTVqZGw6okOrTYneYJquKVfKzY724P5Rbl9XLBKnz oxKA== X-Forwarded-Encrypted: i=1; AKwUvByco29bn+YjH9JyjuMvU9mPTjhD0wJTj6vbuoRV3PHzPFuzYzum+rzXKRoqOS3g/nChUtKDY60VfmVQUWM=@vger.kernel.org X-Gm-Message-State: AFuF++mk2g27w63WKdFz9+TVfk++oC4Eq8aHSzZdSc4Jt+5LnY2+De0o JeuDQbGpTnIbhzsO0II++6AHZpCpcs2xeVZW8IM26w0YbWvyyw9PvkGVg0mC6uR3Y42y X-Gm-Gg: AYBFou0/WEa93EuS2biatRetKIlIN/DXGaw6Kt7FWm3IAwYPlgr0zIBreCRoZcdF80E Bl7HT8BhC/8dQoA6Cq5aReJjslAK5RB8u+eJMzU8fRzKSBoPBpDrQ77Bl+Fof05RuoPhO6yXh1a WZm3stUSbE2gpGav3k1hHf+UqdsSkCUWZ8nG8P++oAobNNpJwnwRDnOnteMx4Zx1Uo5nnG5BM28 0628k9rnIjmn9VAv+r+P2LPHtwT47RfXYKxhOuwzFgHBaB1sO1zcd/ODgSjOClU7D9XDqXVL6md kQINFsMDcPiJGhHzlH18G9Qo+kBOFZVqxAdrvIxlajNrmFjlEsEU/2MJwwbDaDjefHRxwAdz1ax P9MuJzwcBnJTczAT4e32HcTt5lGt3h/vWuCF1Z0ymy1gtaaZPSXuUK8sWaIojmnS6+kn8AfgBgG V9F+H9SM2As/991HuXv7gyRKxqxmMUA8vWRj9XPjYl5BZpNTdDI5L2Bvlgm45j X-Received: by 2002:a05:690e:810:20b0:671:4a9e:7c91 with SMTP id 956f58d0204a3-6714dfd252cmr743318d50.10.1789404124390; Mon, 14 Sep 2026 09:42:04 -0700 (PDT) Received: from [192.168.1.110] ([2600:1700:1ff0:d0ef::d15]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-67125df42a8sm4879023d50.8.2026.09.14.09.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 09:42:04 -0700 (PDT) From: Andrew Halaney Date: Mon, 14 Sep 2026 11:41:44 -0500 Subject: [PATCH 3/3] Documentation: keys: document IDs added since KEY_SPEC_REQKEY_AUTH_KEY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-ajhalaney-dmverity-key-identifier-v1-3-01922dc1366a@amutable.com> References: <20260914-ajhalaney-dmverity-key-identifier-v1-0-01922dc1366a@amutable.com> In-Reply-To: <20260914-ajhalaney-dmverity-key-identifier-v1-0-01922dc1366a@amutable.com> To: Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , David Howells , Jarkko Sakkinen , Paul Moore , James Morris , "Serge E. Hallyn" , Eric Biggers , "Theodore Y. Ts'o" , Jonathan Corbet , Shuah Khan , Randy Dunlap Cc: dm-devel@lists.linux.dev, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, bpf@vger.kernel.org, fsverity@lists.linux.dev, linux-doc@vger.kernel.org, Andrew Halaney , "Christian Brauner (Amutable)" X-Mailer: b4 0.14.3 The table of special key IDs stops at KEY_SPEC_REQKEY_AUTH_KEY. Fill in all the new ones. Suggested-by: Christian Brauner (Amutable) Signed-off-by: Andrew Halaney Reviewed-by: Christian Brauner (Amutable) --- Documentation/security/keys/core.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Documentation/security/keys/core.rst b/Documentation/security/= keys/core.rst index 326b8a973828..37ed42382f16 100644 --- a/Documentation/security/keys/core.rst +++ b/Documentation/security/keys/core.rst @@ -372,6 +372,19 @@ process making the call:: KEY_SPEC_GROUP_KEYRING -6 GID-specific keyring KEY_SPEC_REQKEY_AUTH_KEY -7 assumed request_key() authorisation key + KEY_SPEC_REQUESTOR_KEYRING -8 request_key() destination + keyring + +There are also values that refer to a specific kernel keyring rather than = to +anything belonging to the caller. These keyrings are not linked into any +keyring, so a search cannot reach them and the ID is the only way to name +one:: + + CONSTANT VALUE KEY REFERENCED + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + KEY_SPEC_BPF_KEYRING -9 the ".bpf" keyring + KEY_SPEC_DM_VERITY_KEYRING -10 the ".dm-verity" keyring + KEY_SPEC_FS_VERITY_KEYRING -11 the ".fs-verity" keyring =20 =20 The main syscalls are: --=20 2.55.0