Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes an error in sha512_ssse3 that leads to incorrect
output as well as a memory leak in caam_jr when the module is
unloaded"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: caam - fix memleak in caam_jr module
crypto: sha512_ssse3 - fix byte count to bit count conversion
+4
-6
+1
-1
arch/x86/crypto/sha512_ssse3_glue.c
+1
-1
arch/x86/crypto/sha512_ssse3_glue.c
···
141
141
142
142
/* save number of bits */
143
143
bits[1] = cpu_to_be64(sctx->count[0] << 3);
144
-
bits[0] = cpu_to_be64(sctx->count[1] << 3) | sctx->count[0] >> 61;
144
+
bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61);
145
145
146
146
/* Pad out to 112 mod 128 and append length */
147
147
index = sctx->count[0] & 0x7f;
+3
-5
drivers/crypto/caam/jr.c
+3
-5
drivers/crypto/caam/jr.c
···
453
453
int error;
454
454
455
455
jrdev = &pdev->dev;
456
-
jrpriv = kmalloc(sizeof(struct caam_drv_private_jr),
457
-
GFP_KERNEL);
456
+
jrpriv = devm_kmalloc(jrdev, sizeof(struct caam_drv_private_jr),
457
+
GFP_KERNEL);
458
458
if (!jrpriv)
459
459
return -ENOMEM;
460
460
···
487
487
488
488
/* Now do the platform independent part */
489
489
error = caam_jr_init(jrdev); /* now turn on hardware */
490
-
if (error) {
491
-
kfree(jrpriv);
490
+
if (error)
492
491
return error;
493
-
}
494
492
495
493
jrpriv->dev = jrdev;
496
494
spin_lock(&driver_data.jr_alloc_lock);