* [patch] crypto/ablkcipher: missing return statement
@ 2010-07-15 7:57 Dan Carpenter
2010-07-16 2:21 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2010-07-15 7:57 UTC (permalink / raw)
To: Herbert Xu
Cc: David S. Miller, Richard Hartmann, linux-crypto, kernel-janitors
The intent was to return here. In the original an allocation failure
would lead to a NULL dereference.
Signed-off-by: Dan Carpenter <error27@gmail.com>
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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch] crypto/ablkcipher: missing return statement
2010-07-15 7:57 [patch] crypto/ablkcipher: missing return statement Dan Carpenter
@ 2010-07-16 2:21 ` David Miller
2010-07-16 2:23 ` Herbert Xu
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2010-07-16 2:21 UTC (permalink / raw)
To: error27; +Cc: herbert, richih.mailinglist, linux-crypto, kernel-janitors
From: Dan Carpenter <error27@gmail.com>
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 <error27@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] crypto/ablkcipher: missing return statement
2010-07-16 2:21 ` David Miller
@ 2010-07-16 2:23 ` Herbert Xu
2010-07-16 2:27 ` Herbert Xu
0 siblings, 1 reply; 4+ messages in thread
From: Herbert Xu @ 2010-07-16 2:23 UTC (permalink / raw)
To: David Miller; +Cc: error27, richih.mailinglist, linux-crypto, kernel-janitors
On Thu, Jul 15, 2010 at 07:21:41PM -0700, David Miller wrote:
> From: Dan Carpenter <error27@gmail.com>
> 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 <error27@gmail.com>
>
> Acked-by: David S. Miller <davem@davemloft.net>
Thanks, applied to crypto-2.6.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] crypto/ablkcipher: missing return statement
2010-07-16 2:23 ` Herbert Xu
@ 2010-07-16 2:27 ` Herbert Xu
0 siblings, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2010-07-16 2:27 UTC (permalink / raw)
To: David Miller; +Cc: error27, richih.mailinglist, linux-crypto, kernel-janitors
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 <error27@gmail.com>
> > 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 <error27@gmail.com>
> >
> > Acked-by: David S. Miller <davem@davemloft.net>
>
> 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 <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-16 2:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-15 7:57 [patch] crypto/ablkcipher: missing return statement Dan Carpenter
2010-07-16 2:21 ` David Miller
2010-07-16 2:23 ` Herbert Xu
2010-07-16 2:27 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox