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=1794674508; b=sF8E2wmVSvaJul4xgqPr9hlKfXzJy78uxTbVMQ0kuUjK4UT84tx4kW/7AOlPKZnAflZj V2/IQ4uYPAdOkVXL9U8S3tlD+FB1zwPFHFmV6NXW1h0tOXvCI8ze3YRtsOSczKremrhJ1 7ydD7v2P8yqCPB/NWw1xI3FtRy7esBFUSWwBos71WO3P8o/VlLxzeHlfZZnuiGQ3Wf6/E q+NQ3o3jeo+tx9lhQw19705xQrUerTxKEAeN0SoiO5bPjqlggAv4dKsLacL1i2hrmVQs4 LWvJB08Ub8osOYwpmtOA6ojn/5lijmgeKg1ULgZNUBj+vof8GvnMs/MZwcOs9UQaPBA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794674508; 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=z7/9m64gY/828rfrdGhHEl3/mTUlnjpR4+8jD7ga8CywruO/quH55EyVgCjnvf1PYtmz d6I36K4LQFPitpgG5VMbYLMt8ZEUX+AcnaKJLGtDZ5vnp0XkwLShRkmZNt2iQqXmR/seF 7HJbWeb3sulUoDzKtnZXdO8IkC2Ew8KRrmmwFPIZdTRRGcwFpt5rMtc3Sy/N7vOoqrX5/ CrjuiUt4W9mVS9L1Zc0H6s/e7WN3EVJAOmzyiK4ItHyqcH896SDwwH/PCURWDXtIRjMFi xoJaTThicev061ZWmUXJNEvMGrOjgeZQRhEhDTbPVggjDEtwVzT//oPIwLxvUuRJxBw== 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="aQ3B/7e+"; 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 38713606A32E; Sat, 14 Nov 2026 16:41:47 +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=aQ3B/7e+ Received: by smtp.kernel.org (Postfix) with UTF8SMTPSA id 0DAA51F000CB; Sat, 14 Nov 2026 16:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794674507; bh=I0LV/JQpN8yDGYTTWcI8HQY8CmcG+PtzomAV8QbPhzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aQ3B/7e+SHzX/umLCjrFJ11HzH5P0a+YnEy800yCi1nt2DCuF7vC39noj9P5FdFDe QswZnxmj9US+xmstVLrBnVAMHZXn9K9IDRL7XRcBBNfXf7EZEGBBh7j8k4I22XpmWH iBHA1AWjG6S2yzMqFA/nkHfTFkqqO90iphFcT7nZzFWh6j1RjTuGZG9betUJv7AoE8 tTnAfmgxFatzPoYeW54lbPP1COGS8mLgCg9iKSJ6nSS+7kDmqWKmqyk5731UX2WYan /FfaIuvEQq1/8rC7HFtgfP3W3HsVo2pvMt6/VUB3o2da8VT+z0RjcvBSnNVBLOifRi VeY4BL74k3Nsw== 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 v12 1/6] s390/cert_store: Pin the user session keyring Date: Sat, 14 Nov 2026 18:41:34 +0200 Message-ID: <20261114164139.429814-2-jarkko@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261114164139.429814-1-jarkko@kernel.org> References: <20261114164139.429814-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