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

Commit 7123fd41 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 a memory corruption in the padlock-aes driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: padlock-aes - Fix Nano workaround data corruption
parents 0585df46 46d8c4b2

drivers/crypto/padlock-aes.c

+6 −2
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key, 
		return;

	}



	count -= initial;



	if (initial)

		asm volatile (".byte 0xf3,0x0f,0xa7,0xc8"	/* rep xcryptecb */

			      : "+S"(input), "+D"(output)
@@ -273,7 +275,7 @@ static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key, 


	asm volatile (".byte 0xf3,0x0f,0xa7,0xc8"	/* rep xcryptecb */

		      : "+S"(input), "+D"(output)

		      : "d"(control_word), "b"(key), "c"(count - initial));

		      : "d"(control_word), "b"(key), "c"(count));

}



static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,
@@ -284,6 +286,8 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, 
	if (count < cbc_fetch_blocks)

		return cbc_crypt(input, output, key, iv, control_word, count);



	count -= initial;



	if (initial)

		asm volatile (".byte 0xf3,0x0f,0xa7,0xd0"	/* rep xcryptcbc */

			      : "+S" (input), "+D" (output), "+a" (iv)
@@ -291,7 +295,7 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, 


	asm volatile (".byte 0xf3,0x0f,0xa7,0xd0"	/* rep xcryptcbc */

		      : "+S" (input), "+D" (output), "+a" (iv)

		      : "d" (control_word), "b" (key), "c" (count-initial));

		      : "d" (control_word), "b" (key), "c" (count));

	return iv;

}