[PATCH v14 05/12] KEYS: Move KEY_LOOKUP_ to include/linux/key.h and set KEY_LOOKUP_FLAGS_ALL

[Jarkko Sakkinen]

On Wed, Aug 31, 2022 at 07:51:47AM +0300, Jarkko Sakkinen wrote:
> On Wed, Aug 31, 2022 at 05:53:28AM +0300, Jarkko Sakkinen wrote:
> > On Tue, Aug 30, 2022 at 06:17:09PM +0200, Roberto Sassu wrote:
> > > From: Roberto Sassu <roberto.sassu at huawei.com>
> > > 
> > > In preparation for the patch that introduces the bpf_lookup_user_key() eBPF
> > > kfunc, move KEY_LOOKUP_ definitions to include/linux/key.h, to be able to
> > > validate the kfunc parameters.
> > > 
> > > Also, define the new constant KEY_LOOKUP_FLAGS_ALL, to facilitate checking
> > > whether a variable contains only defined flags.
> > > 
> > > Signed-off-by: Roberto Sassu <roberto.sassu at huawei.com>
> > > Reviewed-by: KP Singh <kpsingh at kernel.org>
> > > ---
> > >  include/linux/key.h      | 4 ++++
> > >  security/keys/internal.h | 2 --
> > >  2 files changed, 4 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/include/linux/key.h b/include/linux/key.h
> > > index 7febc4881363..e2a70e0fa89f 100644
> > > --- a/include/linux/key.h
> > > +++ b/include/linux/key.h
> > > @@ -88,6 +88,10 @@ enum key_need_perm {
> > >  	KEY_DEFER_PERM_CHECK,	/* Special: permission check is deferred */
> > >  };
> > >  
> > > +#define KEY_LOOKUP_CREATE	0x01
> > > +#define KEY_LOOKUP_PARTIAL	0x02
> > > +#define KEY_LOOKUP_FLAGS_ALL	(KEY_LOOKUP_CREATE | KEY_LOOKUP_PARTIAL)
> > 
> > IMHO this could be just KEY_LOOKUP_ALL.
> > 
> > > +
> > >  struct seq_file;
> > >  struct user_struct;
> > >  struct signal_struct;
> > > diff --git a/security/keys/internal.h b/security/keys/internal.h
> > > index 9b9cf3b6fcbb..3c1e7122076b 100644
> > > --- a/security/keys/internal.h
> > > +++ b/security/keys/internal.h
> > > @@ -165,8 +165,6 @@ extern struct key *request_key_and_link(struct key_type *type,
> > >  
> > >  extern bool lookup_user_key_possessed(const struct key *key,
> > >  				      const struct key_match_data *match_data);
> > > -#define KEY_LOOKUP_CREATE	0x01
> > > -#define KEY_LOOKUP_PARTIAL	0x02
> > >  
> > >  extern long join_session_keyring(const char *name);
> > >  extern void key_change_session_keyring(struct callback_head *twork);
> > > -- 
> > > 2.25.1
> > > 
> > 
> > Other than that wfm.
> 
> Roberto, with the change done above, just add my ack
> to the next version:
> 
> Acked-by: Jarkko Sakkinen <jarkko at kernel.org>

And it is fine also to pick this to the bpf tree with
rest of the patch set (in the end).

BR, Jarkko