[<prev] [next>] [day] [month] [year] [list]
Message-ID: <DB3PR10MB68352FC6A4C266DBF7ECEBD4E8A6A@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM>
Date: Thu, 2 Nov 2023 09:39:29 +0530
From: Yuran Pereira <yuran.pereira@...mail.com>
To: linux-crypto@...r.kernel.org, herbert@...dor.apana.org.au
Cc: Yuran Pereira <yuran.pereira@...mail.com>, davem@...emloft.net,
tglx@...utronix.de, mingo@...hat.com, bp@...en8.de,
dave.hansen@...ux.intel.com, x86@...nel.org, hpa@...or.com,
linux-kernel@...r.kernel.org,
linux-kernel-mentees@...ts.linuxfoundation.org
Subject: [PATCH 5/7] crypto: Fixes uninitialized skcipher_walk use in aria_aesni_avx2_glue
In `aria_avx2_ctr_encrypt()`, `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: 1521842 ("Unintialized scalar variable")
Signed-off-by: Yuran Pereira <yuran.pereira@...mail.com>
---
arch/x86/crypto/aria_aesni_avx2_glue.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/crypto/aria_aesni_avx2_glue.c b/arch/x86/crypto/aria_aesni_avx2_glue.c
index 87a11804fc77..d5a8077f9f96 100644
--- a/arch/x86/crypto/aria_aesni_avx2_glue.c
+++ b/arch/x86/crypto/aria_aesni_avx2_glue.c
@@ -12,6 +12,7 @@
#include <linux/err.h>
#include <linux/module.h>
#include <linux/types.h>
+#include <linux/string.h>
#include "ecb_cbc_helpers.h"
#include "aria-avx.h"
@@ -94,6 +95,7 @@ static int aria_avx2_ctr_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) > 0) {
--
2.25.1
Powered by blists - more mailing lists