ecryptfs: initialize new auth_tokens before teardown

PATCH New Eric Sandeen 1 participant 1 message Dec 11, 2007 Ecrypt file system

Share & tools

Eric Sandeen

author

2007-12-11 23:53 UTC #0 lore raw

PATCH 1/1 ecryptfs: initialize new auth_tokens before teardown

ecryptfs_destroy_mount_crypt_stat() checks whether each auth_tok->global_auth_tok_key is nonzero and if so puts that key. However, in some early mount error paths nothing has initialized the pointer, and we try to key_put() garbage. Running the bad cipher tests in the testsuite exposes this, and it's happy with the following change.

Signed-off-by Eric Sandeen <[email protected]>

---

fs/ecryptfs/keystore.c +1 -1

Index: linux/fs/ecryptfs/keystore.c
===================================================================
@@ -1851,7 +1851,7 @@ ecryptfs_add_global_auth_tok(struct ecry
 	struct ecryptfs_global_auth_tok *new_auth_tok;
 	int rc = 0;
 
-	new_auth_tok = kmem_cache_alloc(ecryptfs_global_auth_tok_cache,
+	new_auth_tok = kmem_cache_zalloc(ecryptfs_global_auth_tok_cache,
 					GFP_KERNEL);
 	if (!new_auth_tok) {
 		rc = -ENOMEM;