From: Eric Biggers <ebiggers3@gmail.com>
To: linux-crypto@vger.kernel.org, Herbert Xu <herbert@gondor.apana.org.au>
Cc: Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
Salvatore Benedetto <salvatore.benedetto@intel.com>,
Tudor-Dan Ambarus <tudor.ambarus@microchip.com>,
Mat Martineau <mathew.j.martineau@linux.intel.com>,
Stephan Mueller <smueller@chronox.de>,
qat-linux@intel.com, keyrings@vger.kernel.org,
Eric Biggers <ebiggers@google.com>
Subject: [PATCH v2 5/5] crypto: dh - Remove pointless checks for NULL 'p' and 'g'
Date: Sun, 5 Nov 2017 18:30:48 -0800 [thread overview]
Message-ID: <20171106023048.8067-6-ebiggers3@gmail.com> (raw)
In-Reply-To: <20171106023048.8067-1-ebiggers3@gmail.com>
From: Eric Biggers <ebiggers@google.com>
Neither 'p' nor 'g' can be NULL, as they were unpacked using
crypto_dh_decode_key(). And it makes no sense for them to be optional.
So remove the NULL checks that were copy-and-pasted into both modules.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
crypto/dh.c | 3 ---
drivers/crypto/qat/qat_common/qat_asym_algs.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/crypto/dh.c b/crypto/dh.c
index aadaf36fb56f..5659fe7f446d 100644
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -53,9 +53,6 @@ static int dh_check_params_length(unsigned int p_len)
static int dh_set_params(struct dh_ctx *ctx, struct dh *params)
{
- if (unlikely(!params->p || !params->g))
- return -EINVAL;
-
if (dh_check_params_length(params->p_size << 3))
return -EINVAL;
diff --git a/drivers/crypto/qat/qat_common/qat_asym_algs.c b/drivers/crypto/qat/qat_common/qat_asym_algs.c
index 7655fdb499de..13c52d6bf630 100644
--- a/drivers/crypto/qat/qat_common/qat_asym_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_asym_algs.c
@@ -443,9 +443,6 @@ static int qat_dh_set_params(struct qat_dh_ctx *ctx, struct dh *params)
struct qat_crypto_instance *inst = ctx->inst;
struct device *dev = &GET_DEV(inst->accel_dev);
- if (unlikely(!params->p || !params->g))
- return -EINVAL;
-
if (qat_dh_check_params_length(params->p_size << 3))
return -EINVAL;
--
2.15.0
next prev parent reply other threads:[~2017-11-06 2:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-06 2:30 [PATCH v2 0/5] crypto: dh - input validation fixes Eric Biggers
2017-11-06 2:30 ` [PATCH v2 1/5] crypto: dh - Fix double free of ctx->p Eric Biggers
2017-11-06 8:55 ` Tudor Ambarus
2017-11-06 2:30 ` [PATCH v2 2/5] crypto: dh - Don't permit 'p' to be 0 Eric Biggers
2017-11-06 2:30 ` [PATCH v2 3/5] crypto: dh - Don't permit 'key' or 'g' size longer than 'p' Eric Biggers
2017-11-06 10:29 ` Tudor Ambarus
2017-11-06 2:30 ` [PATCH v2 4/5] crypto: qat - Clean up error handling in qat_dh_set_secret() Eric Biggers
2017-11-06 2:30 ` Eric Biggers [this message]
2017-11-06 10:29 ` [PATCH v2 5/5] crypto: dh - Remove pointless checks for NULL 'p' and 'g' Tudor Ambarus
2017-11-10 11:36 ` [PATCH v2 0/5] crypto: dh - input validation fixes Herbert Xu
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=20171106023048.8067-6-ebiggers3@gmail.com \
--to=ebiggers3@gmail.com \
--cc=ebiggers@google.com \
--cc=giovanni.cabiddu@intel.com \
--cc=herbert@gondor.apana.org.au \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=qat-linux@intel.com \
--cc=salvatore.benedetto@intel.com \
--cc=smueller@chronox.de \
--cc=tudor.ambarus@microchip.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;
as well as URLs for NNTP newsgroup(s).