2022-09-09 06:07:56

by Gaosheng Cui

Subject: [PATCH] security/keys: remove request_key_conswq and keyring_search_instkey() declarations

request_key_conswq has been removed since
commit 76181c134f87 ("KEYS: Make request_key() and co fundamentally
asynchronous").

keyring_search_instkey() has been removed since
commit b5f545c880a2 ("[PATCH] keys: Permit running process to
instantiate keys").

so remove the declare for them from header file.

Signed-off-by: Gaosheng Cui <[email protected]>
---
security/keys/internal.h | 4 ----
1 file changed, 4 deletions(-)

diff --git a/security/keys/internal.h b/security/keys/internal.h
index 9b9cf3b6fcbb..6a2fb45c22f8 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -86,7 +86,6 @@ extern struct kmem_cache *key_jar;
extern struct rb_root key_serial_tree;
extern spinlock_t key_serial_lock;
extern struct mutex key_construction_mutex;
-extern wait_queue_head_t request_key_conswq;

extern void key_set_index_key(struct keyring_index_key *index_key);
extern struct key_type *key_type_lookup(const char *type);
@@ -109,9 +108,6 @@ extern void __key_link_end(struct key *keyring,
extern key_ref_t find_key_to_update(key_ref_t keyring_ref,
const struct keyring_index_key *index_key);

-extern struct key *keyring_search_instkey(struct key *keyring,
- key_serial_t target_id);
-
extern int iterate_over_keyring(const struct key *keyring,
int (*func)(const struct key *key, void *data),
void *data);
--
2.25.1

2022-09-12 11:42:59

by Jarkko Sakkinen

Subject: Re: [PATCH] security/keys: remove request_key_conswq and keyring_search_instkey() declarations

"KEYS: Remove orphan declarations from security/keys/internal.h"

On Fri, Sep 09, 2022 at 02:04:52PM +0800, Gaosheng Cui wrote:
> request_key_conswq has been removed since
> commit 76181c134f87 ("KEYS: Make request_key() and co fundamentally
> asynchronous").
>
> keyring_search_instkey() has been removed since
> commit b5f545c880a2 ("[PATCH] keys: Permit running process to
> instantiate keys").
>
> so remove the declare for them from header file.
>
> Signed-off-by: Gaosheng Cui <[email protected]>

"
Remove the following orphan declarations from security/keys/internal.h:

1. request_key_conswq()
2. keyring_search_instkey()
"

Then add two fixes tags after that.

BR, Jarkko

2022-09-13 02:44:22

by Gaosheng Cui

Subject: Re: [PATCH] security/keys: remove request_key_conswq and keyring_search_instkey() declarations

Thanks for taking the time to review this patch, I have made a patch V2 and submitted it.

link: https://patchwork.kernel.org/project/linux-security-module/patch/[email protected]/

?? 2022/9/12 19:39, Jarkko Sakkinen д??:
> "KEYS: Remove orphan declarations from security/keys/internal.h"
>
> On Fri, Sep 09, 2022 at 02:04:52PM +0800, Gaosheng Cui wrote:
>> request_key_conswq has been removed since
>> commit 76181c134f87 ("KEYS: Make request_key() and co fundamentally
>> asynchronous").
>>
>> keyring_search_instkey() has been removed since
>> commit b5f545c880a2 ("[PATCH] keys: Permit running process to
>> instantiate keys").
>>
>> so remove the declare for them from header file.
>>
>> Signed-off-by: Gaosheng Cui <[email protected]>
> "
> Remove the following orphan declarations from security/keys/internal.h:
>
> 1. request_key_conswq()
> 2. keyring_search_instkey()
> "
>
> Then add two fixes tags after that.
>
> BR, Jarkko
>
> .