2014-06-17 14:29:15

by Jeff Liu

Subject: [PATCH 06/24] crypt: return actual error code on pcrypt_init

From: Jie Liu <[email protected]>

Return the actual error code if call kset_create_and_add() failed

Cc: Herbert Xu <[email protected]>
Cc: David S. Miller" <[email protected]>
Signed-off-by: Jie Liu <[email protected]>
---
crypto/pcrypt.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 309d345..053fb10 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -523,11 +523,13 @@ static struct crypto_template pcrypt_tmpl = {

static int __init pcrypt_init(void)
{
- int err = -ENOMEM;
+ int err;

pcrypt_kset = kset_create_and_add("pcrypt", NULL, kernel_kobj);
- if (!pcrypt_kset)
+ if (IS_ERR(pcrypt_kset)) {
+ err = PTR_ERR(pcrypt_kset);
goto err;
+ }

err = pcrypt_init_padata(&pencrypt, "pencrypt");
if (err)
--
1.8.3.2

2014-06-17 19:21:06

by Greg KH

Subject: Re: [PATCH 06/24] crypt: return actual error code on pcrypt_init

On Tue, Jun 17, 2014 at 10:29:02PM +0800, Jeff Liu wrote:
> From: Jie Liu <[email protected]>
>
> Return the actual error code if call kset_create_and_add() failed
>
> Cc: Herbert Xu <[email protected]>
> Cc: David S. Miller" <[email protected]>
> Signed-off-by: Jie Liu <[email protected]>
> ---
> crypto/pcrypt.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)

Herbert and David, please do not take this patch, it is incorrect.

thanks,

greg k-h