Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: skcipher - Fix skcipher_dequeue_givcrypt NULL test

+12 -4
+9 -2
crypto/algapi.c
··· 692 692 } 693 693 EXPORT_SYMBOL_GPL(crypto_enqueue_request); 694 694 695 - struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue) 695 + void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset) 696 696 { 697 697 struct list_head *request; 698 698 ··· 707 707 request = queue->list.next; 708 708 list_del(request); 709 709 710 - return list_entry(request, struct crypto_async_request, list); 710 + return (char *)list_entry(request, struct crypto_async_request, list) - 711 + offset; 712 + } 713 + EXPORT_SYMBOL_GPL(__crypto_dequeue_request); 714 + 715 + struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue) 716 + { 717 + return __crypto_dequeue_request(queue, 0); 711 718 } 712 719 EXPORT_SYMBOL_GPL(crypto_dequeue_request); 713 720
+1
include/crypto/algapi.h
··· 137 137 void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen); 138 138 int crypto_enqueue_request(struct crypto_queue *queue, 139 139 struct crypto_async_request *request); 140 + void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset); 140 141 struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue); 141 142 int crypto_tfm_in_queue(struct crypto_queue *queue, struct crypto_tfm *tfm); 142 143
+2 -2
include/crypto/internal/skcipher.h
··· 79 79 static inline struct skcipher_givcrypt_request *skcipher_dequeue_givcrypt( 80 80 struct crypto_queue *queue) 81 81 { 82 - return container_of(ablkcipher_dequeue_request(queue), 83 - struct skcipher_givcrypt_request, creq); 82 + return __crypto_dequeue_request( 83 + queue, offsetof(struct skcipher_givcrypt_request, creq.base)); 84 84 } 85 85 86 86 static inline void *skcipher_givcrypt_reqctx(