Commit 39fac853 authored Oct 06, 2010 by Roberto Sassu Committed by Tyler Hicks Oct 29, 2010

ecryptfs: checking return code of ecryptfs_find_auth_tok_for_sig()

This patch replaces the check of the 'matching_auth_tok' pointer with
the exit status of ecryptfs_find_auth_tok_for_sig().
This avoids to use authentication tokens obtained through the function
ecryptfs_keyring_auth_tok_for_sig which are not valid.

Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Cc: Dustin Kirkland <kirkland@canonical.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>

parent aee683b9

fs/ecryptfs/keystore.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1819,11 +1819,11 @@ find_next_matching_auth_tok:
		rc = -EINVAL;
		goto out_wipe_list;
		}
		ecryptfs_find_auth_tok_for_sig(&auth_tok_key,
		rc = ecryptfs_find_auth_tok_for_sig(&auth_tok_key,
		&matching_auth_tok,
		crypt_stat->mount_crypt_stat,
		candidate_auth_tok_sig);
		if (matching_auth_tok) {
		if (!rc) {
		found_auth_tok = 1;
		goto found_matching_auth_tok;
		}

Admin message