From: Yuran Pereira <yuran.pereira@hotmail.com>
To: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au
Cc: Yuran Pereira <yuran.pereira@hotmail.com>,
davem@davemloft.net, tglx@linutronix.de, mingo@redhat.com,
bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org,
hpa@zytor.com, linux-kernel@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org
Subject: [PATCH 4/7] crypto: Fixes uninitialized skcipher_walk use in aesni-intel_glue
Date: Thu, 2 Nov 2023 09:39:28 +0530 [thread overview]
Message-ID: <DB3PR10MB6835F2320CEC2E4B90F63D8BE8A6A@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <20231102040931.1556061-1-yuran.pereira@hotmail.com>
In the following functions:
- `sm4_avx_ctr_crypt`
- `ecb_encrypt`
- `ecb_decrypt`
- `cbc_encrypt`
- `cbc_decrypt`
- `cts_cbc_encrypt`
- `cts_cbc_decrypt`
- `ctr_crypt`
- `xctr_crypt`
- `xts_crypt`
`struct skcipher_walk *walk` is not fully initialized before its use.
Although the call to `skcipher_walk_virt()` and subsequent functions
that this function calls seem to initialize some fields of this struct,
there is a chance that `skcipher_walk_virt()` returns
without fully clearing or properly initializing the `->flags` field
which means that the following flags:
`SKCIPHER_WALK_DIFF`, `SKCIPHER_WALK_COPY`, `SKCIPHER_WALK_SLOW`
could be storing junk values by the time `skcipher_walk_done()` is called.
This could lead to buggy or undefined behaviour since these flags
are checked in `skcipher_walk_done()`:
```C
int skcipher_walk_done(struct skcipher_walk *walk, int err)
{
...
if (likely(!(walk->flags & (SKCIPHER_WALK_PHYS |
SKCIPHER_WALK_SLOW |
SKCIPHER_WALK_COPY |
SKCIPHER_WALK_DIFF)))) {
...
}
```
To prevent this, this patch ensures that instances of
`struct skcipher_walk` are correctly initialized prior to their use.
Addresses-Coverity-IDs: 139545, 1508669 ("Unintialized scalar variable")
Signed-off-by: Yuran Pereira <yuran.pereira@hotmail.com>
---
arch/x86/crypto/aesni-intel_glue.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 39d6a62ac627..d2c5f00a33ff 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -35,6 +35,7 @@
#include <linux/workqueue.h>
#include <linux/spinlock.h>
#include <linux/static_call.h>
+#include <linux/string.h>
#define AESNI_ALIGN 16
@@ -296,6 +297,7 @@ static int ecb_encrypt(struct skcipher_request *req)
unsigned int nbytes;
int err;
+ memset(&walk, 0, sizeof(walk));
err = skcipher_walk_virt(&walk, req, false);
while ((nbytes = walk.nbytes)) {
@@ -318,6 +320,7 @@ static int ecb_decrypt(struct skcipher_request *req)
unsigned int nbytes;
int err;
+ memset(&walk, 0, sizeof(walk));
err = skcipher_walk_virt(&walk, req, false);
while ((nbytes = walk.nbytes)) {
@@ -340,6 +343,7 @@ static int cbc_encrypt(struct skcipher_request *req)
unsigned int nbytes;
int err;
+ memset(&walk, 0, sizeof(walk));
err = skcipher_walk_virt(&walk, req, false);
while ((nbytes = walk.nbytes)) {
@@ -362,6 +366,7 @@ static int cbc_decrypt(struct skcipher_request *req)
unsigned int nbytes;
int err;
+ memset(&walk, 0, sizeof(walk));
err = skcipher_walk_virt(&walk, req, false);
while ((nbytes = walk.nbytes)) {
@@ -387,6 +392,8 @@ static int cts_cbc_encrypt(struct skcipher_request *req)
struct skcipher_walk walk;
int err;
+ memset(&walk, 0, sizeof(walk));
+
skcipher_request_set_tfm(&subreq, tfm);
skcipher_request_set_callback(&subreq, skcipher_request_flags(req),
NULL, NULL);
@@ -443,6 +450,8 @@ static int cts_cbc_decrypt(struct skcipher_request *req)
struct skcipher_walk walk;
int err;
+ memset(&walk, 0, sizeof(walk));
+
skcipher_request_set_tfm(&subreq, tfm);
skcipher_request_set_callback(&subreq, skcipher_request_flags(req),
NULL, NULL);
@@ -515,6 +524,7 @@ static int ctr_crypt(struct skcipher_request *req)
unsigned int nbytes;
int err;
+ memset(&walk, 0, sizeof(walk));
err = skcipher_walk_virt(&walk, req, false);
while ((nbytes = walk.nbytes) > 0) {
@@ -566,6 +576,7 @@ static int xctr_crypt(struct skcipher_request *req)
int err;
__le32 block[AES_BLOCK_SIZE / sizeof(__le32)];
+ memset(&walk, 0, sizeof(walk));
err = skcipher_walk_virt(&walk, req, false);
while ((nbytes = walk.nbytes) > 0) {
@@ -912,6 +923,7 @@ static int xts_crypt(struct skcipher_request *req, bool encrypt)
if (req->cryptlen < AES_BLOCK_SIZE)
return -EINVAL;
+ memset(&walk, 0, sizeof(walk));
err = skcipher_walk_virt(&walk, req, false);
if (!walk.nbytes)
return err;
--
2.25.1
next prev parent reply other threads:[~2023-11-02 4:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 4:04 [PATCH 0/7] crypto: Proper Initialization of `struct skcipher_walk` in x86 Glue Files Yuran Pereira
2023-11-02 4:09 ` [PATCH 1/7] crypto: Fixes uninitialized skcipher_walk use in sm4_aesni_avx_glue Yuran Pereira
[not found] ` <20231102040931.1556061-1-yuran.pereira@hotmail.com>
2023-11-02 4:09 ` [PATCH 2/7] crypto: Fixes uninitialized skcipher_walk use in des3_ede_glue Yuran Pereira
2023-11-02 4:09 ` [PATCH 3/7] crypto: Fixes uninitialized skcipher_walk use in chacha_glue Yuran Pereira
2023-11-02 4:09 ` Yuran Pereira [this message]
2023-11-02 4:09 ` [PATCH 5/7] crypto: Fixes uninitialized skcipher_walk use in aria_aesni_avx2_glue Yuran Pereira
2023-11-02 4:09 ` [PATCH 6/7] crypto: Fixes uninitialized skcipher_walk use in aria_aesni_avx_glue Yuran Pereira
2023-11-02 4:09 ` [PATCH 7/7] crypto: Fixes uninitialized skcipher_walk use in aria_gfni_avx512_glue Yuran Pereira
2023-11-02 4:20 ` [PATCH 0/7] crypto: Proper Initialization of `struct skcipher_walk` in x86 Glue Files Eric Biggers
2023-11-02 4:30 ` Herbert Xu
2023-11-02 4:57 ` Yuran Pereira
2023-11-02 5:00 ` 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=DB3PR10MB6835F2320CEC2E4B90F63D8BE8A6A@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM \
--to=yuran.pereira@hotmail.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=hpa@zytor.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.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
all inboxes | Powered by JetHome®