From 699d74b7f038147815f021365f46003d2a263f6c Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Tue, 28 Nov 2006 12:29:49 -0800 Subject: [PATCH] --- yaml --- r: 41108 b: refs/heads/master c: de88777e6942de76410ad2eb2858f5fbb6eb9c35 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/crypto.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f68471cb3830..570f00603d38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cce4856ff3dfa663b1a168dab48120d70820da6 +refs/heads/master: de88777e6942de76410ad2eb2858f5fbb6eb9c35 diff --git a/trunk/fs/ecryptfs/crypto.c b/trunk/fs/ecryptfs/crypto.c index 136175a69332..f63a7755fe86 100644 --- a/trunk/fs/ecryptfs/crypto.c +++ b/trunk/fs/ecryptfs/crypto.c @@ -820,7 +820,8 @@ int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat) crypt_stat->tfm = crypto_alloc_blkcipher(full_alg_name, 0, CRYPTO_ALG_ASYNC); kfree(full_alg_name); - if (!crypt_stat->tfm) { + if (IS_ERR(crypt_stat->tfm)) { + rc = PTR_ERR(crypt_stat->tfm); ecryptfs_printk(KERN_ERR, "cryptfs: init_crypt_ctx(): " "Error initializing cipher [%s]\n", crypt_stat->cipher);