diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-04-30 15:51:45 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-06-28 12:21:27 -0700 |
| commit | 7149dd4d39b54d3a59ecea7b2a95c842aa39a283 (patch) | |
| tree | 53cc929051e9f036ad999c073f74e2f9eb6dd4a7 | |
| parent | 56446c91422e938c60f19fcf36115cbaae737b0d (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.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 875ee0108468..90b326941c67 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -88,12 +88,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(keyring_key); if (!ukp) { /* key was revoked before we acquired its semaphore */ |