Commit 0bb78166 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:
 "Fix an oops in the s5p-sss driver when used with ecb(aes)"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: s5p-sss - Fix kernel Oops in AES-ECB mode
parents a638af00 c927b080

drivers/crypto/s5p-sss.c

+9 −3
Original line number Diff line number Diff line
@@ -1922,15 +1922,21 @@ static void s5p_aes_crypt_start(struct s5p_aes_dev *dev, unsigned long mode) 
	uint32_t aes_control;

	unsigned long flags;

	int err;

	u8 *iv;



	aes_control = SSS_AES_KEY_CHANGE_MODE;

	if (mode & FLAGS_AES_DECRYPT)

		aes_control |= SSS_AES_MODE_DECRYPT;



	if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CBC)

	if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CBC) {

		aes_control |= SSS_AES_CHAIN_MODE_CBC;

	else if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CTR)

		iv = req->info;

	} else if ((mode & FLAGS_AES_MODE_MASK) == FLAGS_AES_CTR) {

		aes_control |= SSS_AES_CHAIN_MODE_CTR;

		iv = req->info;

	} else {

		iv = NULL; /* AES_ECB */

	}



	if (dev->ctx->keylen == AES_KEYSIZE_192)

		aes_control |= SSS_AES_KEY_SIZE_192;
@@ -1961,7 +1967,7 @@ static void s5p_aes_crypt_start(struct s5p_aes_dev *dev, unsigned long mode) 
		goto outdata_error;



	SSS_AES_WRITE(dev, AES_CONTROL, aes_control);

	s5p_set_aes(dev, dev->ctx->aes_key, req->info, dev->ctx->keylen);

	s5p_set_aes(dev, dev->ctx->aes_key, iv, dev->ctx->keylen);



	s5p_set_dma_indata(dev,  dev->sg_src);

	s5p_set_dma_outdata(dev, dev->sg_dst);