|
@@ -0,0 +1,42 @@
|
|
|
+From 28d823a63ee29f5d72c2aba781a06a7e2651cadc Mon Sep 17 00:00:00 2001
|
|
|
+From: Siddhesh Poyarekar <siddhesh@gotplt.org>
|
|
|
+Date: Mon, 7 Apr 2025 06:24:47 -0400
|
|
|
+Subject: [PATCH] cve-2015-3290: Disable AVX for x86_64
|
|
|
+
|
|
|
+When the input compiler enables AVX, stack realignment requirements
|
|
|
+causes gcc to fail to omit %rbp use, due to which the test fails to
|
|
|
+clobber %rbp in inline asm. Disable AVX to build the test on x86_64 so
|
|
|
+that the test continues working.
|
|
|
+
|
|
|
+Link: https://lore.kernel.org/ltp/20250407102448.2605506-2-siddhesh@gotplt.org/
|
|
|
+
|
|
|
+Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/28d823a63ee29f5d72c2aba781a06a7e2651cadc]
|
|
|
+
|
|
|
+Reviewed-by: Martin Doucha <mdoucha@suse.cz>
|
|
|
+Reviewed-by: Petr Vorel <pvorel@suse.cz>
|
|
|
+Signed-off-by: Siddhesh Poyarekar <siddhesh@gotplt.org>
|
|
|
+
|
|
|
+---
|
|
|
+ testcases/cve/Makefile | 6 ++++++
|
|
|
+ 1 file changed, 6 insertions(+)
|
|
|
+
|
|
|
+diff --git a/testcases/cve/Makefile b/testcases/cve/Makefile
|
|
|
+index 01b9b9ccb..98c38e908 100644
|
|
|
+--- a/testcases/cve/Makefile
|
|
|
++++ b/testcases/cve/Makefile
|
|
|
+@@ -22,6 +22,12 @@ ifneq (,$(filter $(HOST_CPU),x86 x86_64))
|
|
|
+ meltdown: CFLAGS += -msse2
|
|
|
+ endif
|
|
|
+
|
|
|
++# The test needs to clobber %rbp, which requires frame pointer omission. Also
|
|
|
++# for x86_64, disable AVX since that could sometimes require a stack
|
|
|
++# realignment, which gets in the way of frame pointer omission.
|
|
|
+ cve-2015-3290: CFLAGS += -pthread -fomit-frame-pointer
|
|
|
++ifeq ($(HOST_CPU),x86_64)
|
|
|
++cve-2015-3290: CFLAGS += -mno-avx
|
|
|
++endif
|
|
|
+
|
|
|
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
|
|
|
+--
|
|
|
+2.37.3
|
|
|
+
|