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

Commit 0cabf2af authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: skcipher - Fix crash on zero-length input 



The skcipher walk interface doesn't handle zero-length input
properly as the old blkcipher walk interface did.  This is due
to the fact that the length check is done too late.

This patch moves the length check forward so that it does the
right thing.

Fixes: b286d8b1 ("crypto: skcipher - Add skcipher walk...")
Cc: <stable@vger.kernel.org>
Reported-by: default avatarStephan Müller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9039f3ef

crypto/skcipher.c

+11 −6
Original line number Diff line number Diff line
@@ -426,14 +426,9 @@ static int skcipher_copy_iv(struct skcipher_walk *walk) 


static int skcipher_walk_first(struct skcipher_walk *walk)

{

	walk->nbytes = 0;



	if (WARN_ON_ONCE(in_irq()))

		return -EDEADLK;



	if (unlikely(!walk->total))

		return 0;



	walk->buffer = NULL;

	if (unlikely(((unsigned long)walk->iv & walk->alignmask))) {

		int err = skcipher_copy_iv(walk);
@@ -452,10 +447,15 @@ static int skcipher_walk_skcipher(struct skcipher_walk *walk, 
{

	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);



	walk->total = req->cryptlen;

	walk->nbytes = 0;



	if (unlikely(!walk->total))

		return 0;



	scatterwalk_start(&walk->in, req->src);

	scatterwalk_start(&walk->out, req->dst);



	walk->total = req->cryptlen;

	walk->iv = req->iv;

	walk->oiv = req->iv;
@@ -509,6 +509,11 @@ static int skcipher_walk_aead_common(struct skcipher_walk *walk, 
	struct crypto_aead *tfm = crypto_aead_reqtfm(req);

	int err;



	walk->nbytes = 0;



	if (unlikely(!walk->total))

		return 0;



	walk->flags &= ~SKCIPHER_WALK_PHYS;



	scatterwalk_start(&walk->in, req->src);