Skip to contentSkip to conversation

Patch "crypto: api - Add crypto_requires_off helper" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 10, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

crypto: api - Add crypto_requires_off helper

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
crypto-api-add-crypto_requires_off-helper.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 016df0abc56ec06d0c63c5318ef53e40738dea8b Mon Sep 17 00:00:00 2001

From: Herbert Xu <[email protected]>
Date: Sun, 26 Feb 2017 12:22:35 +0800
Subject: crypto: api - Add crypto_requires_off helper

From: Herbert Xu <[email protected]>

commit 016df0abc56ec06d0c63c5318ef53e40738dea8b upstream.

This patch adds crypto_requires_off which is an extension of crypto_requires_sync for similar bits such as NEED_FALLBACK.

---
 include/crypto/algapi.h |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
include/crypto/algapi.h +6 -1
@@ -344,13 +344,18 @@ static inline struct crypto_alg *crypto_
 	return crypto_attr_alg(tb[1], type, mask);
 }
 
+static inline int crypto_requires_off(u32 type, u32 mask, u32 off)
+{
+	return (type ^ off) & mask & off;
+}
+
 /*
  * Returns CRYPTO_ALG_ASYNC if type/mask requires the use of sync algorithms.
  * Otherwise returns zero.
  */
 static inline int crypto_requires_sync(u32 type, u32 mask)
 {
-	return (type ^ CRYPTO_ALG_ASYNC) & mask & CRYPTO_ALG_ASYNC;
+	return crypto_requires_off(type, mask, CRYPTO_ALG_ASYNC);
 }
 
 noinline unsigned long __crypto_memneq(const void *a, const void *b, size_t size);

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/crypto-api-add-crypto_requires_off-helper.patch queue-4.10/crypto-testmgr-pad-aes_ccm_enc_tv_template-vector.patch queue-4.10/crypto-vmx-use-skcipher-for-xts-fallback.patch queue-4.10/crypto-xts-add-ecb-dependency.patch queue-4.10/crypto-vmx-use-skcipher-for-cbc-fallback.patch queue-4.10/crypto-xts-propagate-need_fallback-bit.patch