diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-08-29 10:44:04 (GMT) |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-08-29 10:44:04 (GMT) |
commit | 0c7d400fafaeab6014504a6a6249f01bac7f7db4 (patch) | |
tree | 1bce003eb85e15de168dc92ef09d7e94da24fcc5 /include/crypto/internal/skcipher.h | |
parent | b6f34d44cb341ad32f08717d1a2c418e6053a031 (diff) | |
download | linux-fsl-qoriq-0c7d400fafaeab6014504a6a6249f01bac7f7db4.tar.xz |
crypto: skcipher - Fix skcipher_dequeue_givcrypt NULL test
As struct skcipher_givcrypt_request includes struct crypto_request
at a non-zero offset, testing for NULL after converting the pointer
returned by crypto_dequeue_request does not work. This can result
in IPsec crashes when the queue is depleted.
This patch fixes it by doing the pointer conversion only when the
return value is non-NULL. In particular, we create a new function
__crypto_dequeue_request that does the pointer conversion.
Reported-by: Brad Bosch <bradbosch@comcast.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto/internal/skcipher.h')
-rw-r--r-- | include/crypto/internal/skcipher.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h index 2ba42cd..3a748a6 100644 --- a/include/crypto/internal/skcipher.h +++ b/include/crypto/internal/skcipher.h @@ -79,8 +79,8 @@ static inline int skcipher_enqueue_givcrypt( static inline struct skcipher_givcrypt_request *skcipher_dequeue_givcrypt( struct crypto_queue *queue) { - return container_of(ablkcipher_dequeue_request(queue), - struct skcipher_givcrypt_request, creq); + return __crypto_dequeue_request( + queue, offsetof(struct skcipher_givcrypt_request, creq.base)); } static inline void *skcipher_givcrypt_reqctx( |