From: Theo Buehler <tb@openbsd.org>
Date: Fri, 30 Aug 2024 15:06:26 +0000 (+0200)
Subject: Missing .rodata for AVX2/AVX512 codepaths
X-Git-Tag: openssl-3.4.0-alpha1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16e7da091c67e072b6927fcbf8637824bfd13f83;p=thirdparty%2Fopenssl.git

Missing .rodata for AVX2/AVX512 codepaths

This is a follow-up to #23997

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25340)
---

diff --git a/crypto/bn/asm/rsaz-2k-avx512.pl b/crypto/bn/asm/rsaz-2k-avx512.pl
index 7ee02778df5..24fcebcfd1c 100644
--- a/crypto/bn/asm/rsaz-2k-avx512.pl
+++ b/crypto/bn/asm/rsaz-2k-avx512.pl
@@ -393,7 +393,7 @@ $code.=<<___;
 ___
 
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lmask52x4:
     .quad   0xfffffffffffff
@@ -589,7 +589,7 @@ $code.=<<___;
 .size   ossl_extract_multiplier_2x20_win5, .-ossl_extract_multiplier_2x20_win5
 ___
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lones:
     .quad   1,1,1,1
diff --git a/crypto/bn/asm/rsaz-3k-avx512.pl b/crypto/bn/asm/rsaz-3k-avx512.pl
index 8ed5496479b..e8713864e87 100644
--- a/crypto/bn/asm/rsaz-3k-avx512.pl
+++ b/crypto/bn/asm/rsaz-3k-avx512.pl
@@ -485,7 +485,7 @@ $code.=<<___;
 ___
 
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lmask52x4:
     .quad   0xfffffffffffff
@@ -730,7 +730,7 @@ $code.=<<___;
 .size   ossl_extract_multiplier_2x30_win5, .-ossl_extract_multiplier_2x30_win5
 ___
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lones:
     .quad   1,1,1,1
diff --git a/crypto/bn/asm/rsaz-4k-avx512.pl b/crypto/bn/asm/rsaz-4k-avx512.pl
index 8c59b77f778..381c08b0fb5 100644
--- a/crypto/bn/asm/rsaz-4k-avx512.pl
+++ b/crypto/bn/asm/rsaz-4k-avx512.pl
@@ -526,7 +526,7 @@ $code.=<<___;
 ___
 
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lmask52x4:
     .quad   0xfffffffffffff
@@ -786,7 +786,7 @@ $code.=<<___;
 .size   ossl_extract_multiplier_2x40_win5, .-ossl_extract_multiplier_2x40_win5
 ___
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lones:
     .quad   1,1,1,1
diff --git a/crypto/bn/asm/rsaz-avx2.pl b/crypto/bn/asm/rsaz-avx2.pl
index 3d0e342a6b8..78e0ca21d34 100755
--- a/crypto/bn/asm/rsaz-avx2.pl
+++ b/crypto/bn/asm/rsaz-avx2.pl
@@ -1779,6 +1779,7 @@ $code.=<<___;
 	ret
 .size	rsaz_avx2_eligible,.-rsaz_avx2_eligible
 
+.section .rodata align=64
 .align	64
 .Land_mask:
 	.quad	0x1fffffff,0x1fffffff,0x1fffffff,0x1fffffff
@@ -1790,6 +1791,7 @@ $code.=<<___;
 	.long	0,0,0,0, 1,1,1,1
 	.long	2,2,2,2, 3,3,3,3
 	.long	4,4,4,4, 4,4,4,4
+.previous
 .align	64
 ___
 
diff --git a/crypto/modes/asm/aes-gcm-avx512.pl b/crypto/modes/asm/aes-gcm-avx512.pl
index e150c9aa052..d6e5b21b360 100644
--- a/crypto/modes/asm/aes-gcm-avx512.pl
+++ b/crypto/modes/asm/aes-gcm-avx512.pl
@@ -4812,7 +4812,7 @@ ___
 }
 
 $code .= <<___;
-.data
+.section .rodata align=16
 .align 16
 POLY:   .quad     0x0000000000000001, 0xC200000000000000