[PATCH] ext4: Fix return code checking of crypto_alloc_ablkcipher()
From: Richard Weinberger <richard@nod.at>
Date: 2016-01-02 22:12:10
Also in:
lkml
Subsystem:
ext4 file system, filesystems (vfs and infrastructure), the rest · Maintainers:
"Theodore Ts'o", Alexander Viro, Christian Brauner, Linus Torvalds
This function does never return NULL, IS_ERR() is sufficent. Signed-off-by: Richard Weinberger <richard@nod.at> --- fs/ext4/crypto_key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
index c5882b3..436ea2a 100644
--- a/fs/ext4/crypto_key.c
+++ b/fs/ext4/crypto_key.c@@ -234,8 +234,8 @@ retry: goto out; got_key: ctfm = crypto_alloc_ablkcipher(cipher_str, 0, 0); - if (!ctfm || IS_ERR(ctfm)) { - res = ctfm ? PTR_ERR(ctfm) : -ENOMEM; + if (IS_ERR(ctfm)) { + res = PTR_ERR(ctfm); printk(KERN_DEBUG "%s: error %d (inode %u) allocating crypto tfm\n", __func__, res, (unsigned) inode->i_ino);
--
2.5.0