Zero the payloads of user and logon keys before freeing them. This
prevents sensitive key material from being kept around in the slab
caches after a key is released.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
*/
void user_free_preparse(struct key_preparsed_payload *prep)
{
*/
void user_free_preparse(struct key_preparsed_payload *prep)
{
- kfree(prep->payload.data[0]);
+ kzfree(prep->payload.data[0]);
}
EXPORT_SYMBOL_GPL(user_free_preparse);
}
EXPORT_SYMBOL_GPL(user_free_preparse);
+static void user_free_payload_rcu(struct rcu_head *head)
+{
+ struct user_key_payload *payload;
+
+ payload = container_of(head, struct user_key_payload, rcu);
+ kzfree(payload);
+}
+
/*
* update a user defined key
* - the key's semaphore is write-locked
/*
* update a user defined key
* - the key's semaphore is write-locked
prep->payload.data[0] = NULL;
if (zap)
prep->payload.data[0] = NULL;
if (zap)
+ call_rcu(&zap->rcu, user_free_payload_rcu);
return ret;
}
EXPORT_SYMBOL_GPL(user_update);
return ret;
}
EXPORT_SYMBOL_GPL(user_update);
if (upayload) {
rcu_assign_keypointer(key, NULL);
if (upayload) {
rcu_assign_keypointer(key, NULL);
- kfree_rcu(upayload, rcu);
+ call_rcu(&upayload->rcu, user_free_payload_rcu);
{
struct user_key_payload *upayload = key->payload.data[0];
{
struct user_key_payload *upayload = key->payload.data[0];
}
EXPORT_SYMBOL_GPL(user_destroy);
}
EXPORT_SYMBOL_GPL(user_destroy);