Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76ef5e17 authored by Dave Jiang's avatar Dave Jiang Committed by Dan Williams
Browse files

keys: Export lookup_user_key to external users 



Export lookup_user_key() symbol in order to allow nvdimm passphrase
update to retrieve user injected keys.

Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d6548ae4

include/linux/key.h

+3 −0
Original line number Diff line number Diff line
@@ -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.

 */

security/keys/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -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

security/keys/process_keys.c

+1 −0
Original line number Diff line number Diff line
@@ -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