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

Commit f6b24579 authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

keys: fix user_defined key sparse messages 



Replace the rcu_assign_pointer() calls with rcu_assign_keypointer().

Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 3db59dd9

security/keys/user_defined.c

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int user_instantiate(struct key *key, const void *data, size_t datalen) 
	/* attach the data */

	upayload->datalen = datalen;

	memcpy(upayload->data, data, datalen);

	rcu_assign_pointer(key->payload.data, upayload);

	rcu_assign_keypointer(key, upayload);

	ret = 0;



error:
@@ -98,7 +98,7 @@ int user_update(struct key *key, const void *data, size_t datalen) 
	if (ret == 0) {

		/* attach the new data, displacing the old */

		zap = key->payload.data;

		rcu_assign_pointer(key->payload.data, upayload);

		rcu_assign_keypointer(key, upayload);

		key->expiry = 0;

	}
@@ -133,7 +133,7 @@ void user_revoke(struct key *key) 
	key_payload_reserve(key, 0);



	if (upayload) {

		rcu_assign_pointer(key->payload.data, NULL);

		rcu_assign_keypointer(key, NULL);

		kfree_rcu(upayload, rcu);

	}

}