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

Commit c462f16b 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 potential kernel panic in the inside-secure driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: inside-secure - do not use memset on MMIO
parents d60d61f3 bf4407f0

drivers/crypto/inside-secure/safexcel.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int eip197_load_firmwares(struct safexcel_crypto_priv *priv) 
	       EIP197_PE_ICE_SCRATCH_CTRL_CHANGE_ACCESS;

	writel(val, EIP197_PE(priv) + EIP197_PE_ICE_SCRATCH_CTRL);



	memset(EIP197_PE(priv) + EIP197_PE_ICE_SCRATCH_RAM, 0,

	memset_io(EIP197_PE(priv) + EIP197_PE_ICE_SCRATCH_RAM, 0,

		  EIP197_NUM_OF_SCRATCH_BLOCKS * sizeof(u32));



	eip197_write_firmware(priv, fw[FW_IFPP], EIP197_PE_ICE_FPP_CTRL,