diff options
| author | Eric Biggers | 2018-05-01 00:51:45 +0200 |
|---|---|---|
| committer | Theodore Ts'o | 2018-05-20 22:21:04 +0200 |
| commit | 1086c80c4d9144ff32741ddbca2fbb268a5de5f5 (patch) | |
| tree | e609f6cefcb7b7053534f62acc2f741bbae0667f /fs/crypto | |
| parent | fscrypt: make fscrypt_operations.max_namelen an integer (diff) | |
| download | kernel-qcow2-linux-1086c80c4d9144ff32741ddbca2fbb268a5de5f5.tar.gz kernel-qcow2-linux-1086c80c4d9144ff32741ddbca2fbb268a5de5f5.tar.xz kernel-qcow2-linux-1086c80c4d9144ff32741ddbca2fbb268a5de5f5.zip | |
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>
Diffstat (limited to 'fs/crypto')
| -rw-r--r-- | fs/crypto/keyinfo.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 0f6a65c6483b..0b48aa469453 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -89,12 +89,6 @@ static int validate_user_key(struct fscrypt_info *crypt_info, return PTR_ERR(keyring_key); 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); if (!ukp) { /* key was revoked before we acquired its semaphore */ |