From: "Stephan Müller" <smueller@chronox.de>
To: herbert@gondor.apana.org.au
Cc: linux-crypto@vger.kernel.org
Subject: [PATCH 1/2] crypto: skcipher - noop for enc/dec with NULL data
Date: Sun, 24 Sep 2017 08:24:58 +0200 [thread overview]
Message-ID: <1612247.TXa8PiMVpk@positron.chronox.de> (raw)
In-Reply-To: <3874163.dZU00zCVt8@positron.chronox.de>
The encryption / decryption operation is a noop in case the caller
provides zero input data. As this noop is a "valid" operation, the API
calls will return no error, but simply skip any processing.
This fixes a kernel crash with authenc() ciphers and zero plaintext /
ciphertext that can be triggered via AF_ALG from unprivileged user
space.
Fixes: 7a7ffe65c8c5f ("crypto: skcipher - Add top-level skcipher
interface")
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: <stable@vger.kernel.org>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
include/crypto/skcipher.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h
index 562001cb412b..ca27fbadbe67 100644
--- a/include/crypto/skcipher.h
+++ b/include/crypto/skcipher.h
@@ -442,6 +442,9 @@ static inline int crypto_skcipher_encrypt(struct skcipher_request *req)
{
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
+ if (!req->cryptlen)
+ return 0;
+
return tfm->encrypt(req);
}
@@ -460,6 +463,9 @@ static inline int crypto_skcipher_decrypt(struct skcipher_request *req)
{
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
+ if (!req->cryptlen)
+ return 0;
+
return tfm->decrypt(req);
}
--
2.13.5
next prev parent reply other threads:[~2017-09-24 6:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-24 6:22 [PATCH 0/2] fix authenc() kernel crash Stephan Müller
2017-09-24 6:24 ` Stephan Müller [this message]
2017-10-07 2:46 ` [PATCH 1/2] crypto: skcipher - noop for enc/dec with NULL data Herbert Xu
2017-10-07 2:49 ` Stephan Müller
2017-10-07 2:51 ` Herbert Xu
2017-10-07 2:53 ` Stephan Müller
2017-10-07 3:07 ` Herbert Xu
2017-10-07 3:21 ` Stephan Müller
2017-10-07 3:29 ` Herbert Xu
2017-10-07 12:56 ` Stephan Müller
2017-10-09 14:19 ` Herbert Xu
2017-10-09 15:13 ` Stephan Müller
2017-10-09 15:30 ` [PATCH v2] crypto: shash - Fix zero-length shash ahash digest crash Herbert Xu
2017-10-09 15:52 ` Stephan Müller
2017-09-24 6:25 ` [PATCH 2/2] crypto: shash - no kmap of zero SG Stephan Müller
2017-10-07 2:44 ` Herbert Xu
2017-09-24 6:28 ` [PATCH 0/2] fix authenc() kernel crash Stephan Müller
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=1612247.TXa8PiMVpk@positron.chronox.de \
--to=smueller@chronox.de \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.