Merge remote-tracking branch 'cyanogen/cm-13.0' into replicant-6.0-new

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

Conflicts:
	Makefile
	firmware/Makefile
	firmware/epen/W9001_B713.bin.ihex
	firmware/epen/W9001_B746.bin.ihex
	firmware/epen/W9001_B746JD.bin.ihex
	firmware/epen/W9001_B746L.bin.ihex
	firmware/epen/W9001_B746S.bin.ihex

6 files changed, 58 insertions, 5 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 3a6933c..0d12110 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -416,6 +416,15 @@ config CRYPTO_SHA1
 	help
 	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 
+config CRYPTO_SHA1_ARM
+    tristate "SHA1 digest algorithm (ARM-asm)"
+    depends on ARM
+    select CRYPTO_SHA1
+    select CRYPTO_HASH
+    help
+      SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
+      using optimized ARM assembler.
+
 config CRYPTO_SHA256
 	tristate "SHA224 and SHA256 digest algorithm"
 	select CRYPTO_HASH
@@ -571,6 +580,30 @@ config CRYPTO_AES_NI_INTEL
 	  ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
 	  acceleration for CTR.
 
+config CRYPTO_AES_ARM
+    tristate "AES cipher algorithms (ARM-asm)"
+    depends on ARM
+    select CRYPTO_ALGAPI
+    select CRYPTO_AES
+    help
+      Use optimized AES assembler routines for ARM platforms.
+
+      AES cipher algorithms (FIPS-197). AES uses the Rijndael
+      algorithm.
+
+      Rijndael appears to be consistently a very good performer in
+      both hardware and software across a wide range of computing
+      environments regardless of its use in feedback or non-feedback
+      modes. Its key setup time is excellent, and its key agility is
+      good. Rijndael's very low memory requirements make it very well
+      suited for restricted-space environments, in which it also
+      demonstrates excellent performance. Rijndael's operations are
+      among the easiest to defend against power and timing attacks.
+
+      The AES specifies three key sizes: 128, 192 and 256 bits
+
+      See <http://csrc.nist.gov/encryption/aes/> for more information.
+
 config CRYPTO_ANUBIS
 	tristate "Anubis cipher algorithm"
 	select CRYPTO_ALGAPI
diff --git a/crypto/algapi.c b/crypto/algapi.c
index 3fa383c..b644c4b 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -508,7 +508,8 @@ struct crypto_template *crypto_lookup_template(const char *name)
 		return -EACCES;
 	}
 #endif
-	return try_then_request_module(__crypto_lookup_template(name), name);
+	return try_then_request_module(__crypto_lookup_template(name), "%s",
+				       name);
 }
 EXPORT_SYMBOL_GPL(crypto_lookup_template);
 
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 62122a1..fed2868 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -159,6 +159,8 @@ static int hash_recvmsg(struct kiocb *unused, struct socket *sock,
 	else if (len < ds)
 		msg->msg_flags |= MSG_TRUNC;
 
+	msg->msg_namelen = 0;
+
 	lock_sock(sk);
 	if (ctx->more) {
 		ctx->more = 0;
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 6a6dfc0..a1c4f0a 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -432,6 +432,7 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
 	long copied = 0;
 
 	lock_sock(sk);
+	msg->msg_namelen = 0;
 	for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0;
 	     iovlen--, iov++) {
 		unsigned long seglen = iov->iov_len;
diff --git a/crypto/api.c b/crypto/api.c
index 0686dc5..b7ecbdf 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -40,6 +40,8 @@ static inline struct crypto_alg *crypto_alg_get(struct crypto_alg *alg)
 	return alg;
 }
 
+static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
+
 struct crypto_alg *crypto_mod_get(struct crypto_alg *alg)
 {
 	return try_module_get(alg->cra_module) ? crypto_alg_get(alg) : NULL;
@@ -150,8 +152,11 @@ static struct crypto_alg *crypto_larval_add(const char *name, u32 type,
 	}
 	up_write(&crypto_alg_sem);
 
-	if (alg != &larval->alg)
+	if (alg != &larval->alg) {
 		kfree(larval);
+		if (crypto_is_larval(alg))
+			alg = crypto_larval_wait(alg);
+	}
 
 	return alg;
 }
diff --git a/crypto/gcm.c b/crypto/gcm.c
index 1a25263..b97b186 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -44,6 +44,7 @@ struct crypto_rfc4543_ctx {
 
 struct crypto_rfc4543_req_ctx {
 	u8 auth_tag[16];
+	u8 assocbuf[32];
 	struct scatterlist cipher[1];
 	struct scatterlist payload[2];
 	struct scatterlist assoc[2];
@@ -1142,9 +1143,19 @@ static struct aead_request *crypto_rfc4543_crypt(struct aead_request *req,
 	scatterwalk_crypto_chain(payload, dst, vdst == req->iv + 8, 2);
 	assoclen += 8 + req->cryptlen - (enc ? 0 : authsize);
 
-	sg_init_table(assoc, 2);
-	sg_set_page(assoc, sg_page(req->assoc), req->assoc->length,
-		    req->assoc->offset);
+	if (req->assoc->length == req->assoclen) {
+		sg_init_table(assoc, 2);
+		sg_set_page(assoc, sg_page(req->assoc), req->assoc->length,
+			    req->assoc->offset);
+	} else {
+		BUG_ON(req->assoclen > sizeof(rctx->assocbuf));
+
+		scatterwalk_map_and_copy(rctx->assocbuf, req->assoc, 0,
+					 req->assoclen, 0);
+
+		sg_init_table(assoc, 2);
+		sg_set_buf(assoc, rctx->assocbuf, req->assoclen);
+	}
 	scatterwalk_crypto_chain(assoc, payload, 0, 2);
 
 	aead_request_set_tfm(subreq, ctx->child);