Commit 272a1219 authored by Denis Efremov's avatar Denis Efremov Committed by David Howells

security/keys: use kvfree_sensitive()

Use kvfree_sensitive() instead of open-coding it.
Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarBen Boeckel <mathstuf@gmail.com>
parent 8fe62e0c
...@@ -121,8 +121,7 @@ int big_key_preparse(struct key_preparsed_payload *prep) ...@@ -121,8 +121,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);
memzero_explicit(buf, enclen); kvfree_sensitive(buf, enclen);
kvfree(buf);
} 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);
...@@ -140,8 +139,7 @@ int big_key_preparse(struct key_preparsed_payload *prep) ...@@ -140,8 +139,7 @@ int big_key_preparse(struct key_preparsed_payload *prep)
err_enckey: err_enckey:
kfree_sensitive(enckey); kfree_sensitive(enckey);
error: error:
memzero_explicit(buf, enclen); kvfree_sensitive(buf, enclen);
kvfree(buf);
return ret; return ret;
} }
...@@ -273,8 +271,7 @@ long big_key_read(const struct key *key, char *buffer, size_t buflen) ...@@ -273,8 +271,7 @@ long big_key_read(const struct key *key, char *buffer, size_t buflen)
err_fput: err_fput:
fput(file); fput(file);
error: error:
memzero_explicit(buf, enclen); kvfree_sensitive(buf, enclen);
kvfree(buf);
} else { } else {
ret = datalen; ret = datalen;
memcpy(buffer, key->payload.data[big_key_data], datalen); memcpy(buffer, key->payload.data[big_key_data], datalen);
......
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