aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-04-30 18:51:45 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-05-20 16:21:04 -0400
commit1086c80c4d9144ff32741ddbca2fbb268a5de5f5 (patch)
treee609f6cefcb7b7053534f62acc2f741bbae0667f
parente12ee6836a3fd3c6ebc9b2dc8a7974af592340d0 (diff)
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>
-rw-r--r--fs/crypto/keyinfo.c6
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,
89 return PTR_ERR(keyring_key); 89 return PTR_ERR(keyring_key);
90 down_read(&keyring_key->sem); 90 down_read(&keyring_key->sem);
91 91
92 if (keyring_key->type != &key_type_logon) {
93 printk_once(KERN_WARNING
94 "%s: key type must be logon\n", __func__);
95 res = -ENOKEY;
96 goto out;
97 }
98 ukp = user_key_payload_locked(keyring_key); 92 ukp = user_key_payload_locked(keyring_key);
99 if (!ukp) { 93 if (!ukp) {
100 /* key was revoked before we acquired its semaphore */ 94 /* key was revoked before we acquired its semaphore */