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

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

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "This fixes a boundary condition in the blkcipher SG walking code that
  can lead to a crash when used with the new chacha20 algorithm"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - Copy iv from desc even for 0-len walks
parents 173ae9ba 70d906bc

crypto/ablkcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -277,12 +277,12 @@ static int ablkcipher_walk_first(struct ablkcipher_request *req, 
	if (WARN_ON_ONCE(in_irq()))

		return -EDEADLK;



	walk->iv = req->info;

	walk->nbytes = walk->total;

	if (unlikely(!walk->total))

		return 0;



	walk->iv_buffer = NULL;

	walk->iv = req->info;

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

		int err = ablkcipher_copy_iv(walk, tfm, alignmask);

crypto/blkcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -326,12 +326,12 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc, 
	if (WARN_ON_ONCE(in_irq()))

		return -EDEADLK;



	walk->iv = desc->info;

	walk->nbytes = walk->total;

	if (unlikely(!walk->total))

		return 0;



	walk->buffer = NULL;

	walk->iv = desc->info;

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

		int err = blkcipher_copy_iv(walk);

		if (err)