From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "David Howells" <dhowells@redhat.com>
Cc: <keyrings@vger.kernel.org>,
<linux-security-module@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/7] keys: Move key_get() out of line so a tracepoint can be added
Date: Tue, 27 Aug 2024 21:23:14 +0300 [thread overview]
Message-ID: <D3QWJL5NN42Q.K7TNBNJHIG83@kernel.org> (raw)
In-Reply-To: <20240821123616.60401-4-dhowells@redhat.com>
On Wed Aug 21, 2024 at 3:36 PM EEST, David Howells wrote:
> Move key_get() out of line so that a tracepoint can be added into it
> without incurring circular header dependencies or overly expanding the
> callers.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Jarkko Sakkinen <jarkko@kernel.org>
> cc: keyrings@vger.kernel.org
> cc: linux-security-module@vger.kernel.org
> ---
> include/linux/key.h | 6 +-----
> security/keys/key.c | 14 ++++++++++++++
> 2 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/key.h b/include/linux/key.h
> index 943a432da3ae..08062b4f807c 100644
> --- a/include/linux/key.h
> +++ b/include/linux/key.h
> @@ -299,6 +299,7 @@ extern struct key *key_alloc(struct key_type *type,
>
> extern void key_revoke(struct key *key);
> extern void key_invalidate(struct key *key);
> +struct key *key_get(struct key *key);
> extern void key_put(struct key *key);
> extern bool key_put_tag(struct key_tag *tag);
> extern void key_remove_domain(struct key_tag *domain_tag);
> @@ -309,11 +310,6 @@ static inline struct key *__key_get(struct key *key)
> return key;
> }
>
> -static inline struct key *key_get(struct key *key)
> -{
> - return key ? __key_get(key) : key;
> -}
> -
> static inline void key_ref_put(key_ref_t key_ref)
> {
> key_put(key_ref_to_ptr(key_ref));
> diff --git a/security/keys/key.c b/security/keys/key.c
> index 3d7d185019d3..14c7ee77ea15 100644
> --- a/security/keys/key.c
> +++ b/security/keys/key.c
> @@ -635,6 +635,20 @@ int key_reject_and_link(struct key *key,
> }
> EXPORT_SYMBOL(key_reject_and_link);
>
> +/**
> + * key_get - Get a reference on a key
> + * @key: The key to get a reference on.
> + *
> + * Get a reference on a key, if not NULL, and return the parameter.
> + */
> +struct key *key_get(struct key *key)
> +{
> + if (key)
> + refcount_inc(&key->usage);
> + return key;
> +}
> +EXPORT_SYMBOL(key_get);
> +
> /**
> * key_put - Discard a reference to a key.
> * @key: The key to discard a reference from.
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
BR, Jarkko
next prev parent reply other threads:[~2024-08-27 18:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-21 12:36 [PATCH 0/7] keys: Add tracepoints David Howells
2024-08-21 12:36 ` [PATCH 1/7] keys: Out of line key_is_dead() so it can have tracepoints added in David Howells
2024-08-27 18:22 ` Jarkko Sakkinen
2024-08-21 12:36 ` [PATCH 2/7] keys: Extract struct key_user to its own header for tracing purposes David Howells
2024-08-27 18:23 ` Jarkko Sakkinen
2024-08-21 12:36 ` [PATCH 3/7] keys: Move key_get() out of line so a tracepoint can be added David Howells
2024-08-27 18:23 ` Jarkko Sakkinen [this message]
2024-08-21 12:36 ` [PATCH 4/7] keys: Add a key_ref_get() wrapper David Howells
2024-08-27 18:23 ` Jarkko Sakkinen
2024-08-21 12:36 ` [PATCH 5/7] keys: Use key_get() instead of __key_get() David Howells
2024-08-27 18:24 ` Jarkko Sakkinen
2024-08-21 12:36 ` [PATCH 6/7] keys: Provide a key_try_get() function and use it David Howells
2024-08-27 18:24 ` Jarkko Sakkinen
2024-08-21 12:36 ` [PATCH 7/7] keys: Add tracepoints for the keyrings facility David Howells
2024-08-27 18:27 ` Jarkko Sakkinen
2024-09-28 2:03 ` Justin Stitt
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=D3QWJL5NN42Q.K7TNBNJHIG83@kernel.org \
--to=jarkko@kernel.org \
--cc=dhowells@redhat.com \
--cc=keyrings@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).