tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds c0caf7bc c22cff08

+2 -2
unified split
+1 -1
drivers/crypto/n2_core.c
··· 1832 return -ENODEV; 1833 1834 ino = mdesc_get_property(mdesc, node, "ino", &ino_len); 1835 - if (!intr) 1836 return -ENODEV; 1837 1838 if (intr_len != ino_len)
··· 1832 return -ENODEV; 1833 1834 ino = mdesc_get_property(mdesc, node, "ino", &ino_len); 1835 + if (!ino) 1836 return -ENODEV; 1837 1838 if (intr_len != ino_len)
+1 -1
drivers/crypto/padlock-aes.c
··· 286 if (initial) 287 asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ 288 : "+S" (input), "+D" (output), "+a" (iv) 289 - : "d" (control_word), "b" (key), "c" (count)); 290 291 asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ 292 : "+S" (input), "+D" (output), "+a" (iv)
··· 286 if (initial) 287 asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ 288 : "+S" (input), "+D" (output), "+a" (iv) 289 + : "d" (control_word), "b" (key), "c" (initial)); 290 291 asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ 292 : "+S" (input), "+D" (output), "+a" (iv)