Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9ee3a54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3bb314f0 0c7d400f

crypto/algapi.c

+9 −2
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ int crypto_enqueue_request(struct crypto_queue *queue, 
}

EXPORT_SYMBOL_GPL(crypto_enqueue_request);



struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue)

void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset)

{

	struct list_head *request;
@@ -707,7 +707,14 @@ struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue) 
	request = queue->list.next;

	list_del(request);



	return list_entry(request, struct crypto_async_request, list);

	return (char *)list_entry(request, struct crypto_async_request, list) -

	       offset;

}

EXPORT_SYMBOL_GPL(__crypto_dequeue_request);



struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue)

{

	return __crypto_dequeue_request(queue, 0);

}

EXPORT_SYMBOL_GPL(crypto_dequeue_request);

include/crypto/algapi.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ struct crypto_instance *crypto_alloc_instance(const char *name, 
void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen);

int crypto_enqueue_request(struct crypto_queue *queue,

			   struct crypto_async_request *request);

void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset);

struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue);

int crypto_tfm_in_queue(struct crypto_queue *queue, struct crypto_tfm *tfm);

include/crypto/internal/skcipher.h

+2 −2
Original line number Diff line number Diff line
@@ -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(