Skip to content

Nightly-multi-test valgrind fix #10190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rlm2002 wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −9
Open

Nightly-multi-test valgrind fix #10190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions wolfcrypt/src/wc_mlkem_poly.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,7 @@ static int mlkem_gen_matrix_k2_avx2(sword16* a, byte* seed, int transposed)
byte *rand = NULL;
word64 *state = NULL;
#else
byte rand[4 * GEN_MATRIX_SIZE + 2];
byte rand[4 * GEN_MATRIX_SIZE + 4];
word64 state[25 * 4];
#endif
unsigned int ctr0;
Expand All @@ -2302,7 +2302,7 @@ static int mlkem_gen_matrix_k2_avx2(sword16* a, byte* seed, int transposed)
byte* p;

#ifdef WOLFSSL_SMALL_STACK
rand = (byte*)XMALLOC(4 * GEN_MATRIX_SIZE + 2, NULL,
rand = (byte*)XMALLOC(4 * GEN_MATRIX_SIZE + 4, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
state = (word64*)XMALLOC(sizeof(word64) * 25 * 4, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
Expand All @@ -2313,9 +2313,11 @@ static int mlkem_gen_matrix_k2_avx2(sword16* a, byte* seed, int transposed)
}
#endif

/* Loading 64 bits, only using 48 bits. Loading 2 bytes more than used. */
/* Loading 64 bits, only using 48 bits. Loading 4 bytes more than used. */
rand[4 * GEN_MATRIX_SIZE + 0] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 1] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 2] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 3] = 0xff;

if (!transposed) {
state[4*4 + 0] = 0x1f0000 + 0x000;
Expand Down Expand Up @@ -2403,7 +2405,7 @@ static int mlkem_gen_matrix_k3_avx2(sword16* a, byte* seed, int transposed)
byte *rand = NULL;
word64 *state = NULL;
#else
byte rand[4 * GEN_MATRIX_SIZE + 2];
byte rand[4 * GEN_MATRIX_SIZE + 4];
word64 state[25 * 4];
#endif
unsigned int ctr0;
Expand All @@ -2413,7 +2415,7 @@ static int mlkem_gen_matrix_k3_avx2(sword16* a, byte* seed, int transposed)
byte* p;

#ifdef WOLFSSL_SMALL_STACK
rand = (byte*)XMALLOC(4 * GEN_MATRIX_SIZE + 2, NULL,
rand = (byte*)XMALLOC(4 * GEN_MATRIX_SIZE + 4, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
state = (word64*)XMALLOC(sizeof(word64) * 25 * 4, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
Expand All @@ -2424,9 +2426,11 @@ static int mlkem_gen_matrix_k3_avx2(sword16* a, byte* seed, int transposed)
}
#endif

/* Loading 64 bits, only using 48 bits. Loading 2 bytes more than used. */
/* Loading 64 bits, only using 48 bits. Loading 4 bytes more than used. */
rand[4 * GEN_MATRIX_SIZE + 0] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 1] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 2] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 3] = 0xff;

for (k = 0; k < 2; k++) {
for (i = 0; i < 4; i++) {
Expand Down Expand Up @@ -2559,7 +2563,7 @@ static int mlkem_gen_matrix_k4_avx2(sword16* a, byte* seed, int transposed)
byte *rand = NULL;
word64 *state = NULL;
#else
byte rand[4 * GEN_MATRIX_SIZE + 2];
byte rand[4 * GEN_MATRIX_SIZE + 4];
word64 state[25 * 4];
#endif
unsigned int ctr0;
Expand All @@ -2569,7 +2573,7 @@ static int mlkem_gen_matrix_k4_avx2(sword16* a, byte* seed, int transposed)
byte* p;

#ifdef WOLFSSL_SMALL_STACK
rand = (byte*)XMALLOC(4 * GEN_MATRIX_SIZE + 2, NULL,
rand = (byte*)XMALLOC(4 * GEN_MATRIX_SIZE + 4, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
state = (word64*)XMALLOC(sizeof(word64) * 25 * 4, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
Expand All @@ -2580,9 +2584,11 @@ static int mlkem_gen_matrix_k4_avx2(sword16* a, byte* seed, int transposed)
}
#endif

/* Loading 64 bits, only using 48 bits. Loading 2 bytes more than used. */
/* Loading 64 bits, only using 48 bits. Loading 4 bytes more than used. */
rand[4 * GEN_MATRIX_SIZE + 0] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 1] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 2] = 0xff;
rand[4 * GEN_MATRIX_SIZE + 3] = 0xff;

for (k = 0; k < 4; k++) {
for (i = 0; i < 4; i++) {
Expand Down
Loading