2010-07-15 07:59:03

by Dan Carpenter

Subject: [patch] crypto/ablkcipher: missing return statement

The intent was to return here. In the original an allocation failure
would lead to a NULL dereference.

Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 98a6610..a854df2 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -165,7 +165,7 @@ static inline int ablkcipher_next_slow(struct ablkcipher_request *req,

p = kmalloc(n, GFP_ATOMIC);
if (!p)
- ablkcipher_walk_done(req, walk, -ENOMEM);
+ return ablkcipher_walk_done(req, walk, -ENOMEM);

base = p + 1;

2010-07-16 02:21:26

by David Miller

Subject: Re: [patch] crypto/ablkcipher: missing return statement

From: Dan Carpenter <[email protected]>
Date: Thu, 15 Jul 2010 09:57:36 +0200

> The intent was to return here. In the original an allocation failure
> would lead to a NULL dereference.
>
> Signed-off-by: Dan Carpenter <[email protected]>

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

2010-07-16 02:23:20

by Herbert Xu

Subject: Re: [patch] crypto/ablkcipher: missing return statement

On Thu, Jul 15, 2010 at 07:21:41PM -0700, David Miller wrote:
> From: Dan Carpenter <[email protected]>
> Date: Thu, 15 Jul 2010 09:57:36 +0200
>
> > The intent was to return here. In the original an allocation failure
> > would lead to a NULL dereference.
> >
> > Signed-off-by: Dan Carpenter <[email protected]>
>
> Acked-by: David S. Miller <[email protected]>

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

2010-07-16 02:27:30

by Herbert Xu

Subject: Re: [patch] crypto/ablkcipher: missing return statement

On Fri, Jul 16, 2010 at 10:23:11AM +0800, Herbert Xu wrote:
> On Thu, Jul 15, 2010 at 07:21:41PM -0700, David Miller wrote:
> > From: Dan Carpenter <[email protected]>
> > Date: Thu, 15 Jul 2010 09:57:36 +0200
> >
> > > The intent was to return here. In the original an allocation failure
> > > would lead to a NULL dereference.
> > >
> > > Signed-off-by: Dan Carpenter <[email protected]>
> >
> > Acked-by: David S. Miller <[email protected]>
>
> Thanks, applied to crypto-2.6.

Oops I'd already applied the same patch but forgot to push to
Linus. I've done the push now.

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