Commit cb268d80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes-v5.0-rc7' of... 

Merge branch 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull keys fixes from James Morris:
 "Two fixes from Eric Biggers"

* 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: always initialize keyring_index_key::desc_len
  KEYS: user: Align the payload buffer
parents ef4edb3e ede0fa98

include/keys/user-type.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
struct user_key_payload {

	struct rcu_head	rcu;		/* RCU destructor */

	unsigned short	datalen;	/* length of this data */

	char		data[0];	/* actual data */

	char		data[0] __aligned(__alignof__(u64)); /* actual data */

};



extern struct key_type key_type_user;

security/keys/keyring.c

+1 −3
Original line number Diff line number Diff line
@@ -661,9 +661,6 @@ static bool search_nested_keyrings(struct key *keyring, 
	BUG_ON((ctx->flags & STATE_CHECKS) == 0 ||

	       (ctx->flags & STATE_CHECKS) == STATE_CHECKS);



	if (ctx->index_key.description)

		ctx->index_key.desc_len = strlen(ctx->index_key.description);



	/* Check to see if this top-level keyring is what we are looking for

	 * and whether it is valid or not.

	 */
@@ -914,6 +911,7 @@ key_ref_t keyring_search(key_ref_t keyring, 
	struct keyring_search_context ctx = {

		.index_key.type		= type,

		.index_key.description	= description,

		.index_key.desc_len	= strlen(description),

		.cred			= current_cred(),

		.match_data.cmp		= key_default_cmp,

		.match_data.raw_data	= description,

security/keys/proc.c

+1 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ static int proc_keys_show(struct seq_file *m, void *v) 
	int rc;



	struct keyring_search_context ctx = {

		.index_key.type		= key->type,

		.index_key.description	= key->description,

		.index_key		= key->index_key,

		.cred			= m->file->f_cred,

		.match_data.cmp		= lookup_user_key_possessed,

		.match_data.raw_data	= key,

security/keys/request_key.c

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ struct key *request_key_and_link(struct key_type *type, 
	struct keyring_search_context ctx = {

		.index_key.type		= type,

		.index_key.description	= description,

		.index_key.desc_len	= strlen(description),

		.cred			= current_cred(),

		.match_data.cmp		= key_default_cmp,

		.match_data.raw_data	= description,

security/keys/request_key_auth.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ struct key *key_get_instantiation_authkey(key_serial_t target_id) 
	struct key *authkey;

	key_ref_t authkey_ref;



	sprintf(description, "%x", target_id);

	ctx.index_key.desc_len = sprintf(description, "%x", target_id);



	authkey_ref = search_process_keyrings(&ctx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE