Commit 1f5518b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto fixes from Herbert Xu:
 "This fixes a NULL pointer dereference on allocation failure in caam,
  as well as a regression in the ctr mode on s390 that was added with
  the recent concurrency fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: s390 - fix aes,des ctr mode concurrency finding.
  crypto: caam - add allocation failure handling in SPRINTFCAT macro
parents a7aa96a9 3901c112

arch/s390/crypto/aes_s390.c

+3 −0
Original line number Diff line number Diff line
@@ -820,6 +820,9 @@ static int ctr_aes_crypt(struct blkcipher_desc *desc, long func, 
		else

			memcpy(walk->iv, ctrptr, AES_BLOCK_SIZE);

		spin_unlock(&ctrblk_lock);

	} else {

		if (!nbytes)

			memcpy(walk->iv, ctrptr, AES_BLOCK_SIZE);

	}

	/*

	 * final block may be < AES_BLOCK_SIZE, copy only nbytes

arch/s390/crypto/des_s390.c

+3 −0
Original line number Diff line number Diff line
@@ -429,6 +429,9 @@ static int ctr_desall_crypt(struct blkcipher_desc *desc, long func, 
		else

			memcpy(walk->iv, ctrptr, DES_BLOCK_SIZE);

		spin_unlock(&ctrblk_lock);

	} else {

		if (!nbytes)

			memcpy(walk->iv, ctrptr, DES_BLOCK_SIZE);

	}

	/* final block may be < DES_BLOCK_SIZE, copy only nbytes */

	if (nbytes) {

drivers/crypto/caam/error.c

+7 −3
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 
	char *tmp;						\

								\

	tmp = kmalloc(sizeof(format) + max_alloc, GFP_ATOMIC);	\

	if (likely(tmp)) {					\

		sprintf(tmp, format, param);			\

		strcat(str, tmp);				\

		kfree(tmp);					\

	} else {						\

		strcat(str, "kmalloc failure in SPRINTFCAT");	\

	}							\

}



static void report_jump_idx(u32 status, char *outstr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE