[git commit] libbb: mark stack in assembly files read-only
Denys Vlasenko
vda.linux at googlemail.com
Tue Aug 30 15:21:53 UTC 2022
commit: https://git.busybox.net/busybox/commit/?id=526625bc83e63e6e5a3ec5296a1b868e72b3b01e
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Ludwig Nussel <ludwig.nussel at suse.de>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
libbb/hash_md5_sha256_x86-32_shaNI.S | 3 +++
libbb/hash_md5_sha256_x86-64_shaNI.S | 3 +++
libbb/hash_md5_sha_x86-32_shaNI.S | 3 +++
libbb/hash_md5_sha_x86-64.S | 3 +++
libbb/hash_md5_sha_x86-64.S.sh | 3 +++
libbb/hash_md5_sha_x86-64_shaNI.S | 3 +++
6 files changed, 18 insertions(+)
diff --git a/libbb/hash_md5_sha256_x86-32_shaNI.S b/libbb/hash_md5_sha256_x86-32_shaNI.S
index 3905bad9a..a0e4a571a 100644
--- a/libbb/hash_md5_sha256_x86-32_shaNI.S
+++ b/libbb/hash_md5_sha256_x86-32_shaNI.S
@@ -19,6 +19,9 @@
// We do not check SSSE3 in cpuid,
// all SHA-capable CPUs support it as well.
+#ifdef __linux__
+ .section .note.GNU-stack, "", @progbits
+#endif
.section .text.sha256_process_block64_shaNI, "ax", @progbits
.globl sha256_process_block64_shaNI
.hidden sha256_process_block64_shaNI
diff --git a/libbb/hash_md5_sha256_x86-64_shaNI.S b/libbb/hash_md5_sha256_x86-64_shaNI.S
index 082ceafe4..172c2eae2 100644
--- a/libbb/hash_md5_sha256_x86-64_shaNI.S
+++ b/libbb/hash_md5_sha256_x86-64_shaNI.S
@@ -19,6 +19,9 @@
// We do not check SSSE3 in cpuid,
// all SHA-capable CPUs support it as well.
+#ifdef __linux__
+ .section .note.GNU-stack, "", @progbits
+#endif
.section .text.sha256_process_block64_shaNI, "ax", @progbits
.globl sha256_process_block64_shaNI
.hidden sha256_process_block64_shaNI
diff --git a/libbb/hash_md5_sha_x86-32_shaNI.S b/libbb/hash_md5_sha_x86-32_shaNI.S
index 2366b046a..7455a29f0 100644
--- a/libbb/hash_md5_sha_x86-32_shaNI.S
+++ b/libbb/hash_md5_sha_x86-32_shaNI.S
@@ -25,6 +25,9 @@
// We do not check SSSE3/SSE4.1 in cpuid,
// all SHA-capable CPUs support them as well.
+#ifdef __linux__
+ .section .note.GNU-stack, "", @progbits
+#endif
.section .text.sha1_process_block64_shaNI, "ax", @progbits
.globl sha1_process_block64_shaNI
.hidden sha1_process_block64_shaNI
diff --git a/libbb/hash_md5_sha_x86-64.S b/libbb/hash_md5_sha_x86-64.S
index 1d55b91f8..2cdd22015 100644
--- a/libbb/hash_md5_sha_x86-64.S
+++ b/libbb/hash_md5_sha_x86-64.S
@@ -1,6 +1,9 @@
### Generated by hash_md5_sha_x86-64.S.sh ###
#if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__)
+#ifdef __linux__
+ .section .note.GNU-stack, "", @progbits
+#endif
.section .text.sha1_process_block64, "ax", @progbits
.globl sha1_process_block64
.hidden sha1_process_block64
diff --git a/libbb/hash_md5_sha_x86-64.S.sh b/libbb/hash_md5_sha_x86-64.S.sh
index 40c979d35..653fe4989 100755
--- a/libbb/hash_md5_sha_x86-64.S.sh
+++ b/libbb/hash_md5_sha_x86-64.S.sh
@@ -127,6 +127,9 @@ echo \
"### Generated by hash_md5_sha_x86-64.S.sh ###
#if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__)
+#ifdef __linux__
+ .section .note.GNU-stack, \"\", @progbits
+#endif
.section .text.sha1_process_block64, \"ax\", @progbits
.globl sha1_process_block64
.hidden sha1_process_block64
diff --git a/libbb/hash_md5_sha_x86-64_shaNI.S b/libbb/hash_md5_sha_x86-64_shaNI.S
index 794e97040..2f03e1ce4 100644
--- a/libbb/hash_md5_sha_x86-64_shaNI.S
+++ b/libbb/hash_md5_sha_x86-64_shaNI.S
@@ -25,6 +25,9 @@
// We do not check SSSE3/SSE4.1 in cpuid,
// all SHA-capable CPUs support them as well.
+#ifdef __linux__
+ .section .note.GNU-stack, "", @progbits
+#endif
.section .text.sha1_process_block64_shaNI, "ax", @progbits
.globl sha1_process_block64_shaNI
.hidden sha1_process_block64_shaNI
More information about the busybox-cvs
mailing list