From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794685030; b=b/X2YppUXnzr0MLBtL9DtZJgBQ1Qijx3IOMy5eDD1yqvF94divgo55K4h0uL70k5CZCW lvQmM0c4qCi5ZwrKDxikHK0/2h5B8/8imOJZSB6b7+Yh39T3wijo9IVRC/Szz7KHQBXvT sEI0sw0YpYw+ZSoCDoFblbAMQFx0PxyqAepgFimqMc8mgKqtMITTm/J6D1RNH0O0pZixX jrpTxXCEi/9WGGF2PcMi8g6Ow4U8uDWYFP9gXWOlmkGWPIDeZFmlFlWLsy8w8SLmJxrhF g4tqzsBV57Lun+hjJ1A7TNEK9pRErplddjmjl+VkSpsIwyLfKVwz11NeX3uLLhYvJHg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794685030; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=I0LV/JQpN8yDGYTTWcI8HQY8CmcG+PtzomAV8QbPhzo=; b=A0kIDkP3vT4/lYDtQIzkHu1WsJezNzLMUYWjglMeltPWv/WDthMsj2UqvA7C79pM6IaU wDyxEcN2jOYXlpFDiTWWeI5LYwddf6fcNYMFYgNBIDtOnAjbAJkQzXnb25XoQBIg3iMfr Wkt3po6z5Rv4j7yxpJ/Z81DR5Deq+e+UHPw8jcLZQejU5opkgjBAKHaBFae5t6R1NadOs i2UaqN/+iQm22C7zXny0EUQ3wZPx8moeVffwlQRJ9zPuvyYIPOwuqdZvnTomzrpxdMMc4 0Y2QHRP6dSFr+Q1uE+vAA+BlArpZhNfdFweGHmpiUHo6QFDWIKzyUkx1rJ1xxuYmDJQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=I8M7ZqcX; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with UTF8SMTPS id 3FD60606A88A; Sat, 14 Nov 2026 19:37:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=I8M7ZqcX Received: by smtp.kernel.org (Postfix) with UTF8SMTPSA id 35DA71F000C9; Sat, 14 Nov 2026 19:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794685029; bh=I0LV/JQpN8yDGYTTWcI8HQY8CmcG+PtzomAV8QbPhzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=I8M7ZqcXPaYP+mdRZNhZxMYywPZJiUvQb+iwmSYQzDymdOdCzutZNYY6iv7UAsLlU nkWOay5VHOv8GIiILtN1Gn0rByfzGhcthv+PFQXY8SQj15bp29vuvoOoMvIobKQBxY Ovilwdvw1CMKMxql3+68f5fJCK2OfhNsIU2rB4Mh93Rlx76jJubbwBfwGtiwQxQz8w 1DkLel2vyVYIEaA2nrs9QONzWYUMuh/MGUx8sUp19ovIn3J2hJq1yGbheMoVPNDwHB qXFXivGOpOlF0sFNj39/AhCvUVIIT4cyVza+onJQwUx7IEg2/YARGsZqnXRKf8Cn/6 UlG5OP0dsHgmw== From: Jarkko Sakkinen To: David Howells Cc: Jarkko Sakkinen , bpf@vger.kernel.org, dm-devel@lists.linux.dev, fsverity@lists.linux.dev, keyrings@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-security-module@vger.kernel.org, Alasdair Kergon , Alexander Gordeev , Alexei Starovoitov , Alex Shi , Anastasia Eskova , Andrew Morton , Andrii Nakryiko , Benjamin Marzinski , Christian Borntraeger , Daniel Borkmann , Dongliang Mu , Eduard Zingerman , Emil Tsalapatis , Eric Biggers , Ignat Korchagin , Heiko Carstens , Ihor Solodrai , James Bottomley , James Morris , Jiri Olsa , Jonathan Corbet , Kumar Kartikeya Dwivedi , Linus Torvalds , Martin KaFai Lau , Mike Snitzer , Mikulas Patocka , Mimi Zohar , Paul Moore , Peter Oberparleiter , Randy Dunlap , Roberto Sassu , "Serge E. Hallyn" , Shuah Khan , Song Liu , Sven Schnelle , "Theodore Y. Ts'o" , Vasily Gorbik , Yanteng Si , Yonghong Song , stable@vger.kernel.org Subject: [PATCH v13 1/7] s390/cert_store: Pin the user session keyring Date: Sat, 14 Nov 2026 21:36:25 +0200 Message-ID: <20261114193631.731615-2-jarkko@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261114193631.731615-1-jarkko@kernel.org> References: <20261114193631.731615-1-jarkko@kernel.org> X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The user session keyring stays alive only because the session keyring is pinned by current_cred(). Pin the reference at: 1. find_cs_keyring() 2. cleanup_cs_keys() 3. create_cs_keyring() Cc: David Howells Cc: stable@vger.kernel.org # v6.1+ Fixes: 8cf57d7217c3 ("s390: add support for user-defined certificates") Signed-off-by: Jarkko Sakkinen --- arch/s390/kernel/cert_store.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/arch/s390/kernel/cert_store.c b/arch/s390/kernel/cert_store.c index 998f2da56175..bb218b42a2c9 100644 --- a/arch/s390/kernel/cert_store.c +++ b/arch/s390/kernel/cert_store.c @@ -307,7 +307,6 @@ static struct key *get_user_session_keyring(void) PTR_ERR(us_keyring_ref)); return ERR_PTR(-ENOKEY); } - key_ref_put(us_keyring_ref); return key_ref_to_ptr(us_keyring_ref); } @@ -352,11 +351,17 @@ static int invalidate_keyring_keys(struct key *keyring) static struct key *find_cs_keyring(void) { key_ref_t cs_keyring_ref; + struct key *us_keyring; struct key *cs_keyring; - cs_keyring_ref = keyring_search(make_key_ref(get_user_session_keyring(), true), + us_keyring = get_user_session_keyring(); + if (IS_ERR(us_keyring)) + return NULL; + + cs_keyring_ref = keyring_search(make_key_ref(us_keyring, true), &key_type_keyring, CERT_STORE_KEYRING_NAME, false); + key_put(us_keyring); if (!IS_ERR(cs_keyring_ref)) { cs_keyring = key_ref_to_ptr(cs_keyring_ref); key_ref_put(cs_keyring_ref); @@ -373,6 +378,7 @@ static struct key *find_cs_keyring(void) static void cleanup_cs_keys(void) { + struct key *us_keyring; struct key *cs_keyring; cs_keyring = find_cs_keyring(); @@ -390,20 +396,33 @@ static void cleanup_cs_keys(void) keyring_clear(cs_keyring); key_invalidate(cs_keyring); key_put(cs_keyring); - key_unlink(get_user_session_keyring(), cs_keyring); + + us_keyring = get_user_session_keyring(); + if (IS_ERR(us_keyring)) + return; + + key_unlink(us_keyring, cs_keyring); + key_put(us_keyring); } static struct key *create_cs_keyring(void) { static struct key *cs_keyring; + struct key *us_keyring; /* Cleanup previous cs_keyring and all associated keys if any. */ cleanup_cs_keys(); + + us_keyring = get_user_session_keyring(); + if (IS_ERR(us_keyring)) + return NULL; + cs_keyring = keyring_alloc(CERT_STORE_KEYRING_NAME, GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, current_cred(), (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW | KEY_USR_READ, KEY_ALLOC_NOT_IN_QUOTA | KEY_ALLOC_SET_KEEP, - NULL, get_user_session_keyring()); + NULL, us_keyring); + key_put(us_keyring); if (IS_ERR(cs_keyring)) { pr_dbf_msg("Can't allocate cert_store keyring"); return NULL; -- 2.47.3