Linux s390 Architecture development
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko@kernel.org>
To: Heiko Carstens <hca@linux.ibm.com>
Cc: Anastasia Eskova <anastasia.eskova@ibm.com>,
	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 07/15] s390/cert_store: Fix potential use-after-free caused by find_cs_keyring()
Date: Mon, 16 Nov 2026 20:44:59 +0200	[thread overview]
Message-ID: <avtPK9FsNvLkCp9n@kernel.org> (raw)
In-Reply-To: <20261116143534.158375-8-hca@linux.ibm.com>

On Mon, Nov 16, 2026 at 03:35:26PM +0100, Heiko Carstens wrote:
> find_cs_keyring() drops the refcount of cs_keyring before returning it.
> Which means that callers operate on potentially already freed memory.
> 
> Let find_cs_keyring() return cs_keyring with a reference. Since
> cleanup_cs_keys() now performs a balanced put via find_cs_keyring(),
> remove the separate cleanup_cs_keyring error label in fill_cs_keyring()
> and drop the reference unconditionally instead.
> 
> Fixes: 8cf57d7217c3 ("s390: add support for user-defined certificates")
> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
> ---
>  arch/s390/kernel/cert_store.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/s390/kernel/cert_store.c b/arch/s390/kernel/cert_store.c
> index 386fe39fe8bd..b720dd26a557 100644
> --- a/arch/s390/kernel/cert_store.c
> +++ b/arch/s390/kernel/cert_store.c
> @@ -367,17 +367,13 @@ static struct key *find_cs_keyring(void)
>  	cs_keyring_ref = keyring_search(make_key_ref(get_user_session_keyring(), true),
>  					&key_type_keyring, CERT_STORE_KEYRING_NAME,
>  					false);
> -	if (!IS_ERR(cs_keyring_ref)) {
> -		cs_keyring = key_ref_to_ptr(cs_keyring_ref);
> -		key_ref_put(cs_keyring_ref);
> -		goto found;
> -	}
> +	if (!IS_ERR(cs_keyring_ref))
> +		return key_ref_to_ptr(cs_keyring_ref);
> +
>  	/* Search default locations: thread, process, session keyrings */
>  	cs_keyring = request_key(&key_type_keyring, CERT_STORE_KEYRING_NAME, NULL);
>  	if (IS_ERR(cs_keyring))
>  		return NULL;
> -	key_put(cs_keyring);
> -found:
>  	return cs_keyring;
>  }
>  
> @@ -720,14 +716,12 @@ static int fill_cs_keyring(void)
>  		goto cleanup_keys;
>  
>  	rc = add_certificates_to_keyring(vcssb, cs_keyring);
> -	if (rc)
> -		goto cleanup_cs_keyring;
> -
>  	key_put(cs_keyring);
> +	if (rc)
> +		goto cleanup_keys;
> +
>  	goto out;
>  
> -cleanup_cs_keyring:
> -	key_put(cs_keyring);
>  cleanup_keys:
>  	cleanup_cs_keys();
>  out:
> -- 
> 2.56.1
> 


Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

Br, Jarkko

  parent reply	other threads:[~2026-11-16 18:45 UTC|newest]

Thread overview: 40+ 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
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 18:40   ` Jarkko Sakkinen
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 18:42   ` Jarkko Sakkinen
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 18:44   ` Jarkko Sakkinen [this message]
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 19:00   ` Jarkko Sakkinen
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 19:01   ` Jarkko Sakkinen
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 19:01   ` Jarkko Sakkinen
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 19:02   ` Jarkko Sakkinen
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=avtPK9FsNvLkCp9n@kernel.org \
    --to=jarkko@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=keyrings@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=oberpar@linux.ibm.com \
    --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