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

Commit 9ab6e6e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4f440cd5 0378c9a8

arch/x86/crypto/sha512_ssse3_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int sha512_ssse3_final(struct shash_desc *desc, u8 *out) 


	/* save number of bits */

	bits[1] = cpu_to_be64(sctx->count[0] << 3);

	bits[0] = cpu_to_be64(sctx->count[1] << 3) | sctx->count[0] >> 61;

	bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61);



	/* Pad out to 112 mod 128 and append length */

	index = sctx->count[0] & 0x7f;

drivers/crypto/caam/jr.c

+3 −5
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static int caam_jr_probe(struct platform_device *pdev) 
	int error;



	jrdev = &pdev->dev;

	jrpriv = kmalloc(sizeof(struct caam_drv_private_jr),

	jrpriv = devm_kmalloc(jrdev, sizeof(struct caam_drv_private_jr),

			      GFP_KERNEL);

	if (!jrpriv)

		return -ENOMEM;
@@ -487,10 +487,8 @@ static int caam_jr_probe(struct platform_device *pdev) 


	/* Now do the platform independent part */

	error = caam_jr_init(jrdev); /* now turn on hardware */

	if (error) {

		kfree(jrpriv);

	if (error)

		return error;

	}



	jrpriv->dev = jrdev;

	spin_lock(&driver_data.jr_alloc_lock);