]> err.no Git - linux-2.6/commit
ecryptfs: initialize new auth_tokens before teardown
authorEric Sandeen <sandeen@redhat.com>
Tue, 18 Dec 2007 00:19:52 +0000 (16:19 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 18 Dec 2007 03:28:15 +0000 (19:28 -0800)
commit459e216429a04779216b61f0fb61938a459fd1ca
treeed21241e197acdc1162a5c1bc3b48c21a33ed40f
parent60af880339aae440293a0c8e93178fdcb41f8a29
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 <sandeen@redhat.com>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ecryptfs/keystore.c