Browse Source

fscrypt: remove unnecessary check for non-logon key type

We're passing 'key_type_logon' to request_key(), so the found key is
guaranteed to be of type "logon".  Thus, there is no reason to check
later that the key is really a "logon" key.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Eric Biggers 7 years ago
parent
commit
1086c80c4d
1 changed files with 0 additions and 6 deletions
  1. 0 6
      fs/crypto/keyinfo.c

+ 0 - 6
fs/crypto/keyinfo.c

@@ -89,12 +89,6 @@ static int validate_user_key(struct fscrypt_info *crypt_info,
 		return PTR_ERR(keyring_key);
 		return PTR_ERR(keyring_key);
 	down_read(&keyring_key->sem);
 	down_read(&keyring_key->sem);
 
 
-	if (keyring_key->type != &key_type_logon) {
-		printk_once(KERN_WARNING
-				"%s: key type must be logon\n", __func__);
-		res = -ENOKEY;
-		goto out;
-	}
 	ukp = user_key_payload_locked(keyring_key);
 	ukp = user_key_payload_locked(keyring_key);
 	if (!ukp) {
 	if (!ukp) {
 		/* key was revoked before we acquired its semaphore */
 		/* key was revoked before we acquired its semaphore */