Use skcipher_givcrypt_cast(crypto_dequeue_request(queue)) instead, which
does the same thing in much cleaner way. The skcipher_givcrypt_cast()
actually uses container_of() instead of messing around with offsetof()
too.

Signed-off-by: Marek Vasut <[email protected]>
Reported-by: Arnd Bergmann <[email protected]>
Cc: Herbert Xu <[email protected]>
Cc: Pantelis Antoniou <[email protected]>
---
 include/crypto/internal/skcipher.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

NOTE: I only compile-tested this one.
NOTE: Is there any way we can get rid of __crypto_dequeue_request() for good ?
      I doubt we can, since it's exported symbol and thus part of kernel ABI,
      right?

diff --git a/include/crypto/internal/skcipher.h 
b/include/crypto/internal/skcipher.h
index 06e8b32..b3a46c5 100644
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
@@ -81,8 +81,7 @@ static inline int skcipher_enqueue_givcrypt(
 static inline struct skcipher_givcrypt_request *skcipher_dequeue_givcrypt(
        struct crypto_queue *queue)
 {
-       return __crypto_dequeue_request(
-               queue, offsetof(struct skcipher_givcrypt_request, creq.base));
+       return skcipher_givcrypt_cast(crypto_dequeue_request(queue));
 }
 
 static inline void *skcipher_givcrypt_reqctx(
-- 
2.0.0.rc0

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to