mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
ecryptfs: use kzfree()
Use kzfree() instead of memset() + kfree(). Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e2801806de
commit
00fcf2cb6f
@ -740,8 +740,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
|
||||
out_release_free_unlock:
|
||||
crypto_free_hash(s->hash_desc.tfm);
|
||||
out_free_unlock:
|
||||
memset(s->block_aligned_filename, 0, s->block_aligned_filename_size);
|
||||
kfree(s->block_aligned_filename);
|
||||
kzfree(s->block_aligned_filename);
|
||||
out_unlock:
|
||||
mutex_unlock(s->tfm_mutex);
|
||||
out:
|
||||
|
@ -291,8 +291,7 @@ int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon)
|
||||
if (daemon->user_ns)
|
||||
put_user_ns(daemon->user_ns);
|
||||
mutex_unlock(&daemon->mux);
|
||||
memset(daemon, 0, sizeof(*daemon));
|
||||
kfree(daemon);
|
||||
kzfree(daemon);
|
||||
out:
|
||||
return rc;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user