Commit 29a51df0 authored by YueHaibing's avatar YueHaibing Committed by Tyler Hicks
Browse files

ecryptfs: remove unnessesary null check in ecryptfs_keyring_auth_tok_for_sig 



request_key and ecryptfs_get_encrypted_key never
return a NULL pointer, so no need do a null check.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
parent 96827c30

fs/ecryptfs/keystore.c

+2 −2
Original line number Diff line number Diff line
@@ -1627,9 +1627,9 @@ int ecryptfs_keyring_auth_tok_for_sig(struct key **auth_tok_key, 
	int rc = 0;



	(*auth_tok_key) = request_key(&key_type_user, sig, NULL);

	if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {

	if (IS_ERR(*auth_tok_key)) {

		(*auth_tok_key) = ecryptfs_get_encrypted_key(sig);

		if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {

		if (IS_ERR(*auth_tok_key)) {

			printk(KERN_ERR "Could not find key with description: [%s]\n",

			      sig);

			rc = process_request_key_err(PTR_ERR(*auth_tok_key));