summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-07-31 22:49:21 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2017-08-09 14:17:58 +0200
commitd634baea628af60d20a82db911b9dc99a5f16244 (patch)
tree46784a86859a79882f4f7fd764ae9cc0c108b081
parentcrypto: serpent - improve __serpent_setkey with UBSAN (diff)
downloadlinux-d634baea628af60d20a82db911b9dc99a5f16244.tar.xz
linux-d634baea628af60d20a82db911b9dc99a5f16244.zip
crypto: ccp - avoid uninitialized variable warning
The added support for version 5 CCPs introduced a false-positive warning in the RSA implementation: drivers/crypto/ccp/ccp-ops.c: In function 'ccp_run_rsa_cmd': drivers/crypto/ccp/ccp-ops.c:1856:3: error: 'sb_count' may be used uninitialized in this function [-Werror=maybe-uninitialized] This changes the code in a way that should make it easier for the compiler to track the state of the sb_count variable, and avoid the warning. Fixes: 6ba46c7d4d7e ("crypto: ccp - Fix base RSA function for version 5 CCPs") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Gary R Hook <gary.hook@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/ccp/ccp-ops.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c
index cc16cb0fc3af..804924e48c89 100644
--- a/drivers/crypto/ccp/ccp-ops.c
+++ b/drivers/crypto/ccp/ccp-ops.c
@@ -1785,6 +1785,7 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
o_len = 32 * ((rsa->key_size + 255) / 256);
i_len = o_len * 2;
+ sb_count = 0;
if (cmd_q->ccp->vdata->version < CCP_VERSION(5, 0)) {
/* sb_count is the number of storage block slots required
* for the modulus.
@@ -1879,7 +1880,7 @@ e_exp:
ccp_dm_free(&exp);
e_sb:
- if (cmd_q->ccp->vdata->version < CCP_VERSION(5, 0))
+ if (sb_count)
cmd_q->ccp->vdata->perform->sbfree(cmd_q, op.sb_key, sb_count);
return ret;