| Message ID | 153549646033.4089.17866270311512341456.stgit@djiang5-desk3.ch.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Adding security support for nvdimm | expand |
On Tue, Aug 28, 2018 at 3:47 PM Dave Jiang <dave.jiang@intel.com> wrote: > > Export lookup_user_key() symbol in order to allow nvdimm passphrase > update to retrieve user injected keys. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > Cc: David Howells <dhowells@redhat.com> > --- > include/linux/key.h | 3 +++ > security/keys/internal.h | 2 -- > security/keys/process_keys.c | 1 + > 3 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/include/linux/key.h b/include/linux/key.h > index e58ee10f6e58..7099985e35a9 100644 > --- a/include/linux/key.h > +++ b/include/linux/key.h > @@ -346,6 +346,9 @@ static inline key_serial_t key_serial(const struct key *key) > > extern void key_set_timeout(struct key *, unsigned); > > +extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags, > + key_perm_t perm); > + > /* > * The permissions required on a key that we're looking up. > */ > diff --git a/security/keys/internal.h b/security/keys/internal.h > index 9f8208dc0e55..9968b21a76dd 100644 > --- a/security/keys/internal.h > +++ b/security/keys/internal.h > @@ -158,8 +158,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); > -extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags, > - key_perm_t perm); > #define KEY_LOOKUP_CREATE 0x01 > #define KEY_LOOKUP_PARTIAL 0x02 > #define KEY_LOOKUP_FOR_UNLINK 0x04 > diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c > index d5b25e535d3a..ec4fd4531224 100644 > --- a/security/keys/process_keys.c > +++ b/security/keys/process_keys.c > @@ -755,6 +755,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, > put_cred(ctx.cred); > goto try_again; > } > +EXPORT_SYMBOL(lookup_user_key); This looks like a core api for affecting keyctl api internals, should it be EXPORT_SYMBOL_GPL? At a minimum this needs David's ack.
On 09/21/2018 02:59 PM, Dan Williams wrote: > On Tue, Aug 28, 2018 at 3:47 PM Dave Jiang <dave.jiang@intel.com> wrote: >> >> Export lookup_user_key() symbol in order to allow nvdimm passphrase >> update to retrieve user injected keys. >> >> Signed-off-by: Dave Jiang <dave.jiang@intel.com> >> Cc: David Howells <dhowells@redhat.com> >> --- >> include/linux/key.h | 3 +++ >> security/keys/internal.h | 2 -- >> security/keys/process_keys.c | 1 + >> 3 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/include/linux/key.h b/include/linux/key.h >> index e58ee10f6e58..7099985e35a9 100644 >> --- a/include/linux/key.h >> +++ b/include/linux/key.h >> @@ -346,6 +346,9 @@ static inline key_serial_t key_serial(const struct key *key) >> >> extern void key_set_timeout(struct key *, unsigned); >> >> +extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags, >> + key_perm_t perm); >> + >> /* >> * The permissions required on a key that we're looking up. >> */ >> diff --git a/security/keys/internal.h b/security/keys/internal.h >> index 9f8208dc0e55..9968b21a76dd 100644 >> --- a/security/keys/internal.h >> +++ b/security/keys/internal.h >> @@ -158,8 +158,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); >> -extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags, >> - key_perm_t perm); >> #define KEY_LOOKUP_CREATE 0x01 >> #define KEY_LOOKUP_PARTIAL 0x02 >> #define KEY_LOOKUP_FOR_UNLINK 0x04 >> diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c >> index d5b25e535d3a..ec4fd4531224 100644 >> --- a/security/keys/process_keys.c >> +++ b/security/keys/process_keys.c >> @@ -755,6 +755,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, >> put_cred(ctx.cred); >> goto try_again; >> } >> +EXPORT_SYMBOL(lookup_user_key); > > This looks like a core api for affecting keyctl api internals, should > it be EXPORT_SYMBOL_GPL? Yes something I overlooked. > > At a minimum this needs David's ack. > David, can you please ACK? Thanks!
Dan Williams <dan.j.williams@intel.com> wrote: > This looks like a core api for affecting keyctl api internals, should > it be EXPORT_SYMBOL_GPL? No, it should be EXPORT_SYMBOL(). Let me look through the other patches. David
Dave Jiang <dave.jiang@intel.com> wrote: > Export lookup_user_key() symbol in order to allow nvdimm passphrase > update to retrieve user injected keys. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> Acked-by: David Howells <dhowells@redhat.com>
diff --git a/include/linux/key.h b/include/linux/key.h index e58ee10f6e58..7099985e35a9 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -346,6 +346,9 @@ static inline key_serial_t key_serial(const struct key *key) extern void key_set_timeout(struct key *, unsigned); +extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags, + key_perm_t perm); + /* * The permissions required on a key that we're looking up. */ diff --git a/security/keys/internal.h b/security/keys/internal.h index 9f8208dc0e55..9968b21a76dd 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h @@ -158,8 +158,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); -extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags, - key_perm_t perm); #define KEY_LOOKUP_CREATE 0x01 #define KEY_LOOKUP_PARTIAL 0x02 #define KEY_LOOKUP_FOR_UNLINK 0x04 diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index d5b25e535d3a..ec4fd4531224 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -755,6 +755,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, put_cred(ctx.cred); goto try_again; } +EXPORT_SYMBOL(lookup_user_key); /* * Join the named keyring as the session keyring if possible else attempt to
Export lookup_user_key() symbol in order to allow nvdimm passphrase update to retrieve user injected keys. Signed-off-by: Dave Jiang <dave.jiang@intel.com> Cc: David Howells <dhowells@redhat.com> --- include/linux/key.h | 3 +++ security/keys/internal.h | 2 -- security/keys/process_keys.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)