Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-2
+6
-2
drivers/crypto/padlock-aes.c
+6
-2
drivers/crypto/padlock-aes.c
···
266
266
return;
267
267
}
268
268
269
+
count -= initial;
270
+
269
271
if (initial)
270
272
asm volatile (".byte 0xf3,0x0f,0xa7,0xc8" /* rep xcryptecb */
271
273
: "+S"(input), "+D"(output)
···
275
273
276
274
asm volatile (".byte 0xf3,0x0f,0xa7,0xc8" /* rep xcryptecb */
277
275
: "+S"(input), "+D"(output)
278
-
: "d"(control_word), "b"(key), "c"(count - initial));
276
+
: "d"(control_word), "b"(key), "c"(count));
279
277
}
280
278
281
279
static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,
···
286
284
if (count < cbc_fetch_blocks)
287
285
return cbc_crypt(input, output, key, iv, control_word, count);
288
286
287
+
count -= initial;
288
+
289
289
if (initial)
290
290
asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */
291
291
: "+S" (input), "+D" (output), "+a" (iv)
···
295
291
296
292
asm volatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */
297
293
: "+S" (input), "+D" (output), "+a" (iv)
298
-
: "d" (control_word), "b" (key), "c" (count-initial));
294
+
: "d" (control_word), "b" (key), "c" (count));
299
295
return iv;
300
296
}
301
297