From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755284AbZBQTpl (ORCPT ); Tue, 17 Feb 2009 14:45:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754750AbZBQToI (ORCPT ); Tue, 17 Feb 2009 14:44:08 -0500 Received: from cmpxchg.org ([85.214.51.133]:38487 "EHLO cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754745AbZBQToH (ORCPT ); Tue, 17 Feb 2009 14:44:07 -0500 Message-Id: <20090217184136.258819597@cmpxchg.org> User-Agent: quilt/0.47-1 Date: Tue, 17 Feb 2009 19:26:22 +0100 From: Johannes Weiner To: Andrew Morton Cc: Pekka Enberg , Chas Williams , Evgeniy Polyakov , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tyler Hicks Subject: [patch 7/7] ecryptfs: use kzfree() References: <20090217182615.897042724@cmpxchg.org> Content-Disposition: inline; filename=ecryptfs-use-kzfree.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use kzfree() instead of memset() + kfree(). Signed-off-by: Johannes Weiner Reviewed-by: Pekka Enberg Acked-by: Tyler Hicks --- fs/ecryptfs/keystore.c | 3 +-- fs/ecryptfs/messaging.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -740,8 +740,7 @@ ecryptfs_write_tag_70_packet(char *dest, 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: --- a/fs/ecryptfs/messaging.c +++ b/fs/ecryptfs/messaging.c @@ -291,8 +291,7 @@ int ecryptfs_exorcise_daemon(struct ecry 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; }