diff options
| author | Eric Biggers | 2018-05-01 00:51:37 +0200 |
|---|---|---|
| committer | Theodore Ts'o | 2018-05-20 22:21:00 +0200 |
| commit | 9919479b835cb1c92b75965f2e120395078a1c55 (patch) | |
| tree | 9a53724f12e5f694b54b6e25e9fc97927a92dda7 /fs/crypto | |
| parent | fscrypt: clean up after fscrypt_prepare_lookup() conversions (diff) | |
| download | kernel-qcow2-linux-9919479b835cb1c92b75965f2e120395078a1c55.tar.gz kernel-qcow2-linux-9919479b835cb1c92b75965f2e120395078a1c55.tar.xz kernel-qcow2-linux-9919479b835cb1c92b75965f2e120395078a1c55.zip | |
fscrypt: remove unnecessary NULL check when allocating skcipher
crypto_alloc_skcipher() returns an ERR_PTR() on failure, not NULL.
Remove the unnecessary check for NULL.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 05f5ee1f0705..d09df8f751df 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -318,8 +318,8 @@ int fscrypt_get_encryption_info(struct inode *inode) goto out; } ctfm = crypto_alloc_skcipher(cipher_str, 0, 0); - if (!ctfm || IS_ERR(ctfm)) { - res = ctfm ? PTR_ERR(ctfm) : -ENOMEM; + if (IS_ERR(ctfm)) { + res = PTR_ERR(ctfm); pr_debug("%s: error %d (inode %lu) allocating crypto tfm\n", __func__, res, inode->i_ino); goto out; |