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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: padlock - Fix AES-CBC handling on odd-block-sized input
  crypto: n2 - dubious error check
parents c22cff08 c054a076

drivers/crypto/n2_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1832,7 +1832,7 @@ static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node, 
		return -ENODEV;



	ino = mdesc_get_property(mdesc, node, "ino", &ino_len);

	if (!intr)

	if (!ino)

		return -ENODEV;



	if (intr_len != ino_len)

drivers/crypto/padlock-aes.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, 
	if (initial)

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

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

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

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



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

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