Commit 2f9be92d authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman

security/keys: properly zero out sensitive key material in big_key

commit 91080180 upstream.

Error paths forgot to zero out sensitive material, so this patch changes
some kfrees into a kzfrees.
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarEric Biggers <ebiggers3@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Kirill Marinushkin <k.marinushkin@gmail.com>
Cc: security@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b60f791e
...@@ -194,7 +194,7 @@ int big_key_preparse(struct key_preparsed_payload *prep) ...@@ -194,7 +194,7 @@ int big_key_preparse(struct key_preparsed_payload *prep)
*path = file->f_path; *path = file->f_path;
path_get(path); path_get(path);
fput(file); fput(file);
kfree(data); kzfree(data);
} else { } else {
/* Just store the data in a buffer */ /* Just store the data in a buffer */
void *data = kmalloc(datalen, GFP_KERNEL); void *data = kmalloc(datalen, GFP_KERNEL);
...@@ -210,9 +210,9 @@ int big_key_preparse(struct key_preparsed_payload *prep) ...@@ -210,9 +210,9 @@ int big_key_preparse(struct key_preparsed_payload *prep)
err_fput: err_fput:
fput(file); fput(file);
err_enckey: err_enckey:
kfree(enckey); kzfree(enckey);
error: error:
kfree(data); kzfree(data);
return ret; return ret;
} }
...@@ -226,7 +226,7 @@ void big_key_free_preparse(struct key_preparsed_payload *prep) ...@@ -226,7 +226,7 @@ void big_key_free_preparse(struct key_preparsed_payload *prep)
path_put(path); path_put(path);
} }
kfree(prep->payload.data[big_key_data]); kzfree(prep->payload.data[big_key_data]);
} }
/* /*
...@@ -258,7 +258,7 @@ void big_key_destroy(struct key *key) ...@@ -258,7 +258,7 @@ void big_key_destroy(struct key *key)
path->mnt = NULL; path->mnt = NULL;
path->dentry = NULL; path->dentry = NULL;
} }
kfree(key->payload.data[big_key_data]); kzfree(key->payload.data[big_key_data]);
key->payload.data[big_key_data] = NULL; key->payload.data[big_key_data] = NULL;
} }
...@@ -326,7 +326,7 @@ long big_key_read(const struct key *key, char __user *buffer, size_t buflen) ...@@ -326,7 +326,7 @@ long big_key_read(const struct key *key, char __user *buffer, size_t buflen)
err_fput: err_fput:
fput(file); fput(file);
error: error:
kfree(data); kzfree(data);
} else { } else {
ret = datalen; ret = datalen;
if (copy_to_user(buffer, key->payload.data[big_key_data], if (copy_to_user(buffer, key->payload.data[big_key_data],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment