From: Stephan Mueller <smueller@chronox.de>
To: Tadeusz Struk <tadeusz.struk@intel.com>,
"'Herbert Xu'" <herbert@gondor.apana.org.au>
Cc: linux-crypto@vger.kernel.org, "'LKML'" <linux-kernel@vger.kernel.org>
Subject: [PATCH] crypto: aesni: add setkey for driver-gcm-aes-aesni
Date: Sun, 18 Jan 2015 23:56:03 +0100 [thread overview]
Message-ID: <2587101.YvN0IxRmOH@tachyon.chronox.de> (raw)
The cipher registered as __driver-gcm-aes-aesni is never intended
to be used directly by any caller. Instead it is a service mechanism to
rfc4106-gcm-aesni.
The kernel crypto API unconditionally calls the registered setkey
function. In case a caller erroneously uses __driver-gcm-aes-aesni a
call to crypto_aead_setkey will cause a NULL pointer dereference without
this patch.
CC: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
arch/x86/crypto/aesni-intel_glue.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 947c6bf..a278ef9 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -1012,6 +1012,16 @@ static int rfc4106_decrypt(struct aead_request *req)
}
}
+static int __driver_rfc4106_set_key(struct crypto_aead *parent,
+ const u8 *key, unsigned int key_len)
+{
+ /*
+ * __driver-gcm-aes-aesni is only a backend for rfc4106-gcm-aesni
+ * and is never intended to be used as a regular cipher.
+ */
+ return -EOPNOTSUPP;
+}
+
static int __driver_rfc4106_encrypt(struct aead_request *req)
{
u8 one_entry_in_sg = 0;
@@ -1366,6 +1376,7 @@ static struct crypto_alg aesni_algs[] = { {
.cra_module = THIS_MODULE,
.cra_u = {
.aead = {
+ .setkey = __driver_rfc4106_set_key,
.encrypt = __driver_rfc4106_encrypt,
.decrypt = __driver_rfc4106_decrypt,
},
--
2.1.0
next reply other threads:[~2015-01-19 5:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-18 22:56 Stephan Mueller [this message]
2015-01-18 22:58 ` Stephan Mueller
2015-01-19 14:34 ` Tadeusz Struk
2015-01-20 3:17 ` Herbert Xu
2015-01-20 3:35 ` Stephan Mueller
2015-01-20 3:37 ` Herbert Xu
2015-01-20 3:54 ` Stephan Mueller
2015-01-20 4:03 ` Herbert Xu
2015-01-21 1:25 ` Stephan Mueller
2015-01-22 18:23 ` Tadeusz Struk
2015-01-22 21:20 ` Stephan Mueller
2015-01-22 21:55 ` Tadeusz Struk
2015-01-22 22:23 ` Herbert Xu
2015-01-22 22:30 ` Tadeusz Struk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2587101.YvN0IxRmOH@tachyon.chronox.de \
--to=smueller@chronox.de \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tadeusz.struk@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®