From: Milos Vyletel <milos.vyletel@gmail.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org (maintainer:X86 ARCHITECTURE...),
linux-crypto@vger.kernel.org (open list:CRYPTO API),
linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE...)
Cc: linux-coverity@vger.kernel.org, Milos Vyletel <milos.vyletel@gmail.com>
Subject: [PATCH] crypto: x86/sha1: fix coverity CID 1195603
Date: Wed, 30 Apr 2014 15:17:54 -0400 [thread overview]
Message-ID: <1398885474-21388-1-git-send-email-milos.vyletel@gmail.com> (raw)
Coverity detected possible use of uninitialized pointer when printing info
message during module load. While this is higly unlikely to cause any troubles
simple change in sha1_ssse3_mod_init to make it look like sha256/512 init
function will fix this.
260
6. Condition sha1_transform_asm, taking true branch
261 if (sha1_transform_asm) {
CID 1195603 (#1 of 1): Uninitialized pointer read (UNINIT)
7. uninit_use_in_call: Using uninitialized value algo_name when calling printk.
262 pr_info("Using %s optimized SHA-1 implementation\n", algo_name);
263 return crypto_register_shash(&alg);
264 }
Reported-by: <scan-admin@coverity.com>
Signed-off-by: Milos Vyletel <milos.vyletel@gmail.com>
---
arch/x86/crypto/sha1_ssse3_glue.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c
index 74d16ef..5352196 100644
--- a/arch/x86/crypto/sha1_ssse3_glue.c
+++ b/arch/x86/crypto/sha1_ssse3_glue.c
@@ -235,31 +235,33 @@ static bool __init avx2_usable(void)
static int __init sha1_ssse3_mod_init(void)
{
- char *algo_name;
-
/* test for SSSE3 first */
- if (cpu_has_ssse3) {
+ if (cpu_has_ssse3)
sha1_transform_asm = sha1_transform_ssse3;
- algo_name = "SSSE3";
- }
#ifdef CONFIG_AS_AVX
/* allow AVX to override SSSE3, it's a little faster */
if (avx_usable()) {
sha1_transform_asm = sha1_transform_avx;
- algo_name = "AVX";
#ifdef CONFIG_AS_AVX2
/* allow AVX2 to override AVX, it's a little faster */
- if (avx2_usable()) {
+ if (avx2_usable())
sha1_transform_asm = sha1_apply_transform_avx2;
- algo_name = "AVX2";
- }
#endif
}
#endif
if (sha1_transform_asm) {
- pr_info("Using %s optimized SHA-1 implementation\n", algo_name);
+#ifdef CONFIG_AS_AVX
+ if (sha1_transform_asm == sha1_transform_avx)
+ pr_info("Using AVX optimized SHA-1 implementation\n");
+#ifdef CONFIG_AS_AVX2
+ else if (sha1_transform_asm == sha1_transform_avx2)
+ pr_info("Using AVX2 optimized SHA-1 implementation\n");
+#endif
+ else
+#endif
+ pr_info("Using SSSE3 optimized SHA-1 implementation\n");
return crypto_register_shash(&alg);
}
pr_info("Neither AVX nor AVX2 nor SSSE3 is available/usable.\n");
--
1.9.0
next reply other threads:[~2014-04-30 19:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-30 19:17 Milos Vyletel [this message]
2014-05-06 8:28 ` [PATCH] crypto: x86/sha1: fix coverity CID 1195603 Pavel Machek
2014-05-06 14:04 ` Milos Vyletel
[not found] ` <CAAFXRd3UPRU7AgZCGbxo_YW_PGuO-FPvB4VC5zKb+LuqGxFxkQ@mail.gmail.com>
2014-05-06 21:11 ` Pavel Machek
2014-05-08 13:30 ` Herbert Xu
2014-05-24 12:30 ` Marek Vasut
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=1398885474-21388-1-git-send-email-milos.vyletel@gmail.com \
--to=milos.vyletel@gmail.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=hpa@zytor.com \
--cc=linux-coverity@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@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 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).