From: "Stephan Müller" <smueller@chronox.de>
To: herbert@gondor.apana.org.au
Cc: linux-crypto@vger.kernel.org
Subject: [PATCH 2/2] crypto: shash - no kmap of zero SG
Date: Sun, 24 Sep 2017 08:25:17 +0200 [thread overview]
Message-ID: <25135634.rNEetDmbAf@positron.chronox.de> (raw)
In-Reply-To: <3874163.dZU00zCVt8@positron.chronox.de>
In case the caller provides an SG with zero data, prevent a kmap of the
page pointed to by the SG. In this case, it is possible that the page
does not exist.
This fixes a crash in authenc() when the plaintext is zero and thus the
encryption operation is a noop. In this case, no input data exists that
can be hashed. The crash is triggerable via AF_ALG from unprivileged
user space.
Fixes: 3b2f6df08258e ("crypto: hash - Export shash through ahash")
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: <stable@vger.kernel.org>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
crypto/shash.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/crypto/shash.c b/crypto/shash.c
index 5e31c8d776df..32d0e1806bf4 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -278,9 +278,11 @@ int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc)
struct scatterlist *sg = req->src;
unsigned int offset = sg->offset;
unsigned int nbytes = req->nbytes;
+ unsigned int process = min(sg->length,
+ ((unsigned int)(PAGE_SIZE)) - offset);
int err;
- if (nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset)) {
+ if (process && nbytes < process) {
void *data;
data = kmap_atomic(sg_page(sg));
--
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 ` [PATCH 1/2] crypto: skcipher - noop for enc/dec with NULL data Stephan Müller
2017-10-07 2:46 ` 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 ` Stephan Müller [this message]
2017-10-07 2:44 ` [PATCH 2/2] crypto: shash - no kmap of zero SG 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=25135634.rNEetDmbAf@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.