2011-08-06 08:26:25

by Thomas Meyer

[permalink] [raw]
Subject: [PATCH] n2_crypto: Fix a get/put_cpu() imbalance

From: Thomas Meyer <[email protected]>

Fix a get/put_cpu() imbalance in the error case when qp == NULL

Signed-off-by: Thomas Meyer <[email protected]>
---

diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index d0183ddb..6683b58 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -1006,9 +1006,8 @@ static int n2_do_ecb(struct ablkcipher_request *req, bool encrypt)

spin_unlock_irqrestore(&qp->lock, flags);

- put_cpu();
-
out:
+ put_cpu();
n2_chunk_complete(req, NULL);
return err;
}
@@ -1096,9 +1095,8 @@ static int n2_do_chaining(struct ablkcipher_request *req, bool encrypt)

spin_unlock_irqrestore(&qp->lock, flags);

- put_cpu();
-
out:
+ put_cpu();
n2_chunk_complete(req, err ? NULL : final_iv_addr);
return err;
}


2011-08-08 05:56:10

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] n2_crypto: Fix a get/put_cpu() imbalance

From: Thomas Meyer <[email protected]>
Date: Sat, 06 Aug 2011 10:26:25 +0200

> From: Thomas Meyer <[email protected]>
>
> Fix a get/put_cpu() imbalance in the error case when qp == NULL
>
> Signed-off-by: Thomas Meyer <[email protected]>

Acked-by: David S. Miller <[email protected]>

2011-08-10 11:00:09

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH] n2_crypto: Fix a get/put_cpu() imbalance

On Sat, Aug 06, 2011 at 08:26:25AM +0000, Thomas Meyer wrote:
> From: Thomas Meyer <[email protected]>
>
> Fix a get/put_cpu() imbalance in the error case when qp == NULL
>
> Signed-off-by: Thomas Meyer <[email protected]>

I tried to apply your patch but it doesn't work as your mailer
has turned all the tabs into spaces. Please resend and make
sure that you can still apply the patch that the list forwards
back to you.

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2011-08-13 08:00:41

by Thomas Meyer

[permalink] [raw]
Subject: Re: [PATCH] n2_crypto: Fix a get/put_cpu() imbalance

From: Thomas Meyer <[email protected]>

Fix a get/put_cpu() imbalance in the error case when qp == NULL

Signed-off-by: Thomas Meyer <[email protected]>
---

Am Mittwoch, den 10.08.2011, 18:59 +0800 schrieb Herbert Xu:
On Sat, Aug 06, 2011 at 08:26:25AM +0000, Thomas Meyer wrote:
> > From: Thomas Meyer <[email protected]>
> >
> > Fix a get/put_cpu() imbalance in the error case when qp == NULL
> >
> > Signed-off-by: Thomas Meyer <[email protected]>
>
> I tried to apply your patch but it doesn't work as your mailer
> has turned all the tabs into spaces.
>

Actually this was not my mailer's fault...

> Please resend and make
> sure that you can still apply the patch that the list forwards
> back to you.
>
> Thanks,
>

diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index d0183ddb..8944dab 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -1006,9 +1006,9 @@ static int n2_do_ecb(struct ablkcipher_request *req, bool encrypt)

spin_unlock_irqrestore(&qp->lock, flags);

+out:
put_cpu();

-out:
n2_chunk_complete(req, NULL);
return err;
}
@@ -1096,9 +1096,9 @@ static int n2_do_chaining(struct ablkcipher_request *req, bool encrypt)

spin_unlock_irqrestore(&qp->lock, flags);

+out:
put_cpu();

-out:
n2_chunk_complete(req, err ? NULL : final_iv_addr);
return err;
}

2011-08-15 07:20:59

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH] n2_crypto: Fix a get/put_cpu() imbalance

On Sat, Aug 13, 2011 at 09:59:58AM +0200, Thomas Meyer wrote:
> From: Thomas Meyer <[email protected]>
>
> Fix a get/put_cpu() imbalance in the error case when qp == NULL
>
> Signed-off-by: Thomas Meyer <[email protected]>

Patch applied. Thanks!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt