openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

s390xcap.c: Avoid copying structure on initialization 

This is problematic on old compilers. It also avoids duplicating
the read-only data.

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21284)

(cherry picked from commit 0dee3b0421)
This commit is contained in:
Tomas Mraz 2023-06-26 17:13:30 +02:00 committed by Pauli
parent 64aa8eaf12
commit 32d2b5fdd9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/s390xcap.c
View File

@ -57,14 +57,16 @@
cap->NAME[1] = ~cap->NAME[1]; \
}
#define TOK_CPU(NAME) \
#define TOK_CPU_ALIAS(NAME, STRUCT_NAME) \
(sscanf(tok_begin, \
" %" STR(LEN) "s %" STR(LEN) "s ", \
tok[0], tok[1]) == 1 \
&& !strcmp(tok[0], #NAME)) { \
memcpy(cap, &NAME, sizeof(*cap)); \
memcpy(cap, &STRUCT_NAME, sizeof(*cap)); \
}
#define TOK_CPU(NAME) TOK_CPU_ALIAS(NAME, NAME)
#ifndef OSSL_IMPLEMENT_GETAUXVAL
static sigjmp_buf ill_jmp;
static void ill_handler(int sig)
@ -746,9 +748,8 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
/*-
* z16 (2022) - z/Architecture POP
* Implements MSA and MSA1-9 (same as z15).
* Implements MSA and MSA1-9 (same as z15, no need to repeat).
*/
static const struct OPENSSL_s390xcap_st z16 = z15;
char *tok_begin, *tok_end, *buff, tok[S390X_STFLE_MAX][LEN + 1];
int rc, off, i, n;
@ -804,7 +805,7 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
else if TOK_CPU(z13)
else if TOK_CPU(z14)
else if TOK_CPU(z15)
else if TOK_CPU(z16)
else if TOK_CPU_ALIAS(z16, z15)
/* nocex to deactivate cex support */
else if (sscanf(tok_begin, " %" STR(LEN) "s %" STR(LEN) "s ",