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

Commit 035f0cd3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - memory corruption when kmalloc fails in xts/lrw

   - mark some CCP DMA channels as private

   - fix reordering race in padata

   - regression in omap-rng DT description"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: xts,lrw - fix out-of-bounds write after kmalloc failure
  crypto: ccp - Make some CCP DMA channels private
  padata: avoid race in reordering
  dt-bindings: rng: clocks property on omap_rng not always mandatory
parents 728f4b3a 9df0eb18

Documentation/devicetree/bindings/rng/omap_rng.txt

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ Required properties: 
- reg : Offset and length of the register set for the module

- interrupts : the interrupt number for the RNG module.

		Used for "ti,omap4-rng" and "inside-secure,safexcel-eip76"

- clocks: the trng clock source

- clocks: the trng clock source. Only mandatory for the

  "inside-secure,safexcel-eip76" compatible.



Example:

/* AM335x */

crypto/lrw.c

+5 −2
Original line number Diff line number Diff line
@@ -286,8 +286,11 @@ static int init_crypt(struct skcipher_request *req, crypto_completion_t done) 


	subreq->cryptlen = LRW_BUFFER_SIZE;

	if (req->cryptlen > LRW_BUFFER_SIZE) {

		subreq->cryptlen = min(req->cryptlen, (unsigned)PAGE_SIZE);

		rctx->ext = kmalloc(subreq->cryptlen, gfp);

		unsigned int n = min(req->cryptlen, (unsigned int)PAGE_SIZE);



		rctx->ext = kmalloc(n, gfp);

		if (rctx->ext)

			subreq->cryptlen = n;

	}



	rctx->src = req->src;

crypto/xts.c

+5 −2
Original line number Diff line number Diff line
@@ -230,8 +230,11 @@ static int init_crypt(struct skcipher_request *req, crypto_completion_t done) 


	subreq->cryptlen = XTS_BUFFER_SIZE;

	if (req->cryptlen > XTS_BUFFER_SIZE) {

		subreq->cryptlen = min(req->cryptlen, (unsigned)PAGE_SIZE);

		rctx->ext = kmalloc(subreq->cryptlen, gfp);

		unsigned int n = min(req->cryptlen, (unsigned int)PAGE_SIZE);



		rctx->ext = kmalloc(n, gfp);

		if (rctx->ext)

			subreq->cryptlen = n;

	}



	rctx->src = req->src;

drivers/crypto/ccp/ccp-dev-v5.c

+1 −0
Original line number Diff line number Diff line
@@ -1015,6 +1015,7 @@ const struct ccp_vdata ccpv5a = { 


const struct ccp_vdata ccpv5b = {

	.version = CCP_VERSION(5, 0),

	.dma_chan_attr = DMA_PRIVATE,

	.setup = ccp5other_config,

	.perform = &ccp5_actions,

	.bar = 2,

drivers/crypto/ccp/ccp-dev.h

+5 −0
Original line number Diff line number Diff line
@@ -179,6 +179,10 @@ 


/* ------------------------ General CCP Defines ------------------------ */



#define	CCP_DMA_DFLT			0x0

#define	CCP_DMA_PRIV			0x1

#define	CCP_DMA_PUB			0x2



#define CCP_DMAPOOL_MAX_SIZE		64

#define CCP_DMAPOOL_ALIGN		BIT(5)
@@ -636,6 +640,7 @@ struct ccp_actions { 
/* Structure to hold CCP version-specific values */

struct ccp_vdata {

	const unsigned int version;

	const unsigned int dma_chan_attr;

	void (*setup)(struct ccp_device *);

	const struct ccp_actions *perform;

	const unsigned int bar;