2023-07-29 02:57:59

by Yue Haibing

Subject: [PATCH v3 -next] keys: Remove unused extern declarations

From: YueHaibing <[email protected]>

Since commit b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
iterate_over_keyring() is never used, so can be removed.

And commit b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
left behind keyring_search_instkey().

Fixes: b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
Fixes: b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
Signed-off-by: YueHaibing <[email protected]>
---
v3: Add Fixes tag
v2: Also remove keyring_search_instkey()
---
security/keys/internal.h | 7 -------
1 file changed, 7 deletions(-)

diff --git a/security/keys/internal.h b/security/keys/internal.h
index 3c1e7122076b..471cf36dedc0 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -109,13 +109,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);
-
struct keyring_search_context {
struct keyring_index_key index_key;
const struct cred *cred;
--
2.34.1

2023-08-08 00:48:59

by Paul Moore

Subject: Re: [PATCH v3 -next] keys: Remove unused extern declarations

On Fri, Jul 28, 2023 at 10:40 PM Yue Haibing <[email protected]> wrote:
>
> From: YueHaibing <[email protected]>
>
> Since commit b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
> iterate_over_keyring() is never used, so can be removed.
>
> And commit b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
> left behind keyring_search_instkey().
>
> Fixes: b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
> Fixes: b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> v3: Add Fixes tag
> v2: Also remove keyring_search_instkey()
> ---
> security/keys/internal.h | 7 -------
> 1 file changed, 7 deletions(-)

Reviewed-by: Paul Moore <[email protected]>

> diff --git a/security/keys/internal.h b/security/keys/internal.h
> index 3c1e7122076b..471cf36dedc0 100644
> --- a/security/keys/internal.h
> +++ b/security/keys/internal.h
> @@ -109,13 +109,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);
> -
> struct keyring_search_context {
> struct keyring_index_key index_key;
> const struct cred *cred;
> --
> 2.34.1

--
paul-moore.com

2023-09-13 19:36:56

by Jarkko Sakkinen

Subject: Re: [PATCH v3 -next] keys: Remove unused extern declarations

On Wed Sep 13, 2023 at 9:00 PM EEST, Paul Moore wrote:
> On Mon, Aug 7, 2023 at 5:46 PM Paul Moore <[email protected]> wrote:
> > On Fri, Jul 28, 2023 at 10:40 PM Yue Haibing <[email protected]> wrote:
> > >
> > > From: YueHaibing <[email protected]>
> > >
> > > Since commit b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
> > > iterate_over_keyring() is never used, so can be removed.
> > >
> > > And commit b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
> > > left behind keyring_search_instkey().
> > >
> > > Fixes: b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
> > > Fixes: b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
> > > Signed-off-by: YueHaibing <[email protected]>
> > > ---
> > > v3: Add Fixes tag
> > > v2: Also remove keyring_search_instkey()
> > > ---
> > > security/keys/internal.h | 7 -------
> > > 1 file changed, 7 deletions(-)
> >
> > Reviewed-by: Paul Moore <[email protected]>
>
> Jarkko or David, please merge this or explain what is wrong with this patch.

Sorry, I was aiming to pick this, and thanks for reminding.

Applied.

BR, Jarkko

2023-09-13 20:34:43

by Paul Moore

Subject: Re: [PATCH v3 -next] keys: Remove unused extern declarations

On Mon, Aug 7, 2023 at 5:46 PM Paul Moore <[email protected]> wrote:
> On Fri, Jul 28, 2023 at 10:40 PM Yue Haibing <[email protected]> wrote:
> >
> > From: YueHaibing <[email protected]>
> >
> > Since commit b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
> > iterate_over_keyring() is never used, so can be removed.
> >
> > And commit b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
> > left behind keyring_search_instkey().
> >
> > Fixes: b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
> > Fixes: b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
> > Signed-off-by: YueHaibing <[email protected]>
> > ---
> > v3: Add Fixes tag
> > v2: Also remove keyring_search_instkey()
> > ---
> > security/keys/internal.h | 7 -------
> > 1 file changed, 7 deletions(-)
>
> Reviewed-by: Paul Moore <[email protected]>

Jarkko or David, please merge this or explain what is wrong with this patch.

> > diff --git a/security/keys/internal.h b/security/keys/internal.h
> > index 3c1e7122076b..471cf36dedc0 100644
> > --- a/security/keys/internal.h
> > +++ b/security/keys/internal.h
> > @@ -109,13 +109,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);
> > -
> > struct keyring_search_context {
> > struct keyring_index_key index_key;
> > const struct cred *cred;
> > --
> > 2.34.1

--
paul-moore.com

2023-09-13 22:52:35

by Paul Moore

Subject: Re: [PATCH v3 -next] keys: Remove unused extern declarations

On Wed, Sep 13, 2023 at 3:31 PM Jarkko Sakkinen <[email protected]> wrote:
> On Wed Sep 13, 2023 at 9:00 PM EEST, Paul Moore wrote:
> > On Mon, Aug 7, 2023 at 5:46 PM Paul Moore <[email protected]> wrote:
> > > On Fri, Jul 28, 2023 at 10:40 PM Yue Haibing <[email protected]> wrote:
> > > >
> > > > From: YueHaibing <[email protected]>
> > > >
> > > > Since commit b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
> > > > iterate_over_keyring() is never used, so can be removed.
> > > >
> > > > And commit b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
> > > > left behind keyring_search_instkey().
> > > >
> > > > Fixes: b2a4df200d57 ("KEYS: Expand the capacity of a keyring")
> > > > Fixes: b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys")
> > > > Signed-off-by: YueHaibing <[email protected]>
> > > > ---
> > > > v3: Add Fixes tag
> > > > v2: Also remove keyring_search_instkey()
> > > > ---
> > > > security/keys/internal.h | 7 -------
> > > > 1 file changed, 7 deletions(-)
> > >
> > > Reviewed-by: Paul Moore <[email protected]>
> >
> > Jarkko or David, please merge this or explain what is wrong with this patch.
>
> Sorry, I was aiming to pick this, and thanks for reminding.
>
> Applied.

Thanks.

--
paul-moore.com