Linux s390 Architecture development
 help / color / mirror / Atom feed
From: sashiko-bot@kernel.org
To: "Heiko Carstens" <hca@linux.ibm.com>,
	"Jarkko Sakkinen" <jarkko@kernel.org>,
	"Anastasia Eskova" <anastasia.eskova@ibm.com>
Cc: "Sven Schnelle" <svens@linux.ibm.com>,
	"Peter Oberparleiter" <oberpar@linux.ibm.com>,
	"Vasily Gorbik" <gor@linux.ibm.com>,
	"Alexander Gordeev" <agordeev@linux.ibm.com>,
	"Christian Borntraeger" <borntraeger@linux.ibm.com>,
	keyrings@vger.kernel.org, linux-s390@vger.kernel.org
Subject: Re: [PATCH 02/15] s390/cert_store: Fix return code handling in invalidate_keyring_keys()
Date: Mon, 16 Nov 2026 17:55:17 +0000	[thread overview]
Message-ID: <sashiko-outbox-217458@kernel.org> (raw)
In-Reply-To: <20261116143534.158375-3-hca@linux.ibm.com>

Thank you for your contribution! Sashiko AI review found no new issues
in this patch, but noticed 1 related pre-existing issue it does not
introduce:
- [Critical] s390/cert_store: unchecked key_lookup() and UAF in
  invalidate_keyring_keys() [1]
--

commit ad52ff18526194809b9921405599d976809c02b9
Author: Heiko Carstens <hca@linux.ibm.com>

s390/cert_store: Fix return code handling in invalidate_keyring_keys()

This commit adds error handling to invalidate_keyring_keys() when
key_type_keyring.read() returns an error or a short read.

> diff --git a/arch/s390/kernel/cert_store.c b/arch/s390/kernel/cert_store.c
> index d35b1ea22507d..89cc3a1683a32 100644
> --- a/arch/s390/kernel/cert_store.c
> +++ b/arch/s390/kernel/cert_store.c
[ ... ]
> @@ -345,7 +347,7 @@ static int invalidate_keyring_keys(struct key *keyring)
>  		key_put(current_key);
>  		rc = key_unlink(keyring, current_key);
>  		if (rc) {
> -			pr_dbf_msg("Couldn't unlink key %08x: %d", current_key->serial, rc);
> +			pr_dbf_msg("Couldn't unlink key %08x: %ld", current_key->serial, rc);
>  			break;
>  		}
>  	}

[Severity: Critical]
This problem wasn't introduced by this patch, but can current_key in this loop
[1] be an error pointer or be used after free?

keyring->sem is released after reading key_array, without holding references
to the keys.  If a concurrent keyctl operation unlinks a key and garbage
collection frees it before key_lookup(key_array[key_index]) runs, key_lookup()
returns ERR_PTR(-ENOKEY), and dereferencing current_key->serial or passing
current_key to key_invalidate() crashes.

In addition, when key_lookup() succeeds, calling key_put(current_key) before
key_unlink(keyring, current_key) and the current_key->serial debug print drops
the caller's reference early, which allows a concurrent unlink and garbage
collection to free current_key and cause a use-after-free.

[1] https://sashiko.dev/#/bug/linux-3ea8bbf3-6016-4165-bad4-2a5916ce887e

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261116143534.158375-2-hca@linux.ibm.com?part=2

  reply	other threads:[~2026-11-16 17:55 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 14:35 [PATCH 00/15] s390/cert_store: Various fixes Heiko Carstens
2026-11-16 14:35 ` [PATCH 01/15] s390/cert_store: Hold keyring->sem while reading the keyring Heiko Carstens
2026-11-16 17:57   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 02/15] s390/cert_store: Fix return code handling in invalidate_keyring_keys() Heiko Carstens
2026-11-16 17:55   ` sashiko-bot [this message]
2026-11-16 14:35 ` [PATCH 03/15] s390/cert_store: Fix potential use-after-free " Heiko Carstens
2026-11-16 17:08   ` Jarkko Sakkinen
2026-11-16 18:01   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 04/15] s390/cert_store: Check key_lookup() return code " Heiko Carstens
2026-11-16 17:09   ` Jarkko Sakkinen
2026-11-16 17:52   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 05/15] s390/cert_store: Unlink before invalidate " Heiko Carstens
2026-11-16 17:53   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 06/15] s390/cert_store: Fix cs_keyring reference leak in fill_cs_keyring() Heiko Carstens
2026-11-16 17:57   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 07/15] s390/cert_store: Fix potential use-after-free caused by find_cs_keyring() Heiko Carstens
2026-11-16 18:00   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 08/15] s390/cert_store: Remove unnecessary static specifier in create_cs_keyring() Heiko Carstens
2026-11-16 17:48   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 09/15] s390/cert_store: Fix error handling of get_user_session_keyring() Heiko Carstens
2026-11-16 17:58   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 10/15] s390/cert_store: Fix keyring refcount handling in get_user_session_keyring() Heiko Carstens
2026-11-16 17:49   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 11/15] s390/cert_store: Do not search the process keyrings for the cert_store keyring Heiko Carstens
2026-11-16 17:53   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 12/15] s390/cert_store: Validate hash length in check_certificate_valid() Heiko Carstens
2026-11-16 17:51   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 13/15] s390/cert_store: Fix max_vcxe_length output in pr_dbf_vcssb() Heiko Carstens
2026-11-16 17:53   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 14/15] s390/cert_store: Fix out-of-bounds read in pr_dbf_vce() Heiko Carstens
2026-11-16 17:56   ` sashiko-bot
2026-11-16 14:35 ` [PATCH 15/15] s390/cert_store: Initialize ism array in query_diag320_subcodes() Heiko Carstens
2026-11-16 17:55   ` sashiko-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=sashiko-outbox-217458@kernel.org \
    --to=sashiko-bot@kernel.org \
    --cc=agordeev@linux.ibm.com \
    --cc=anastasia.eskova@ibm.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=jarkko@kernel.org \
    --cc=keyrings@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=oberpar@linux.ibm.com \
    --cc=sashiko-reviews@lists.linux.dev \
    --cc=svens@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox