packages/ipxe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!37 [sync] PR-35: [librm] Use explicit operand size when pushing a label address

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-03-26 13:37:14 +00:00 committed by Gitee
commit 7cd5a2ea1b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
0003-librm-Use-explicit-operand-size-when-pushing-a-label.patch Normal file
View File

@ -0,0 +1,62 @@
From 0aa2e4ec963597794dd8f8b36f77f4d0cf4e03c8 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 5 Sep 2023 19:47:38 +0800
Subject: [PATCH] [librm] Use explicit operand size when pushing a label
address
We currently use "push $1f" within inline assembly to push the address
of the real-mode code fragment, relying on the assembler to treat this
as "pushl" for 32-bit code or "pushq" for 64-bit code.
As of binutils commit 5cc0077 ("x86: further adjust extend-to-32bit-
address conditions"), first included in binutils-2.41, this implicit
operand size is no longer calculated as expected and 64-bit builds
will fail with
Error: operand size mismatch for `push'
Fix by adding an explicit operand size to the "push" instruction.
Originally-fixed-by: Justin Cano <jstncno@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
src/arch/x86/include/librm.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/arch/x86/include/librm.h b/src/arch/x86/include/librm.h
index 5196d39..40f0754 100644
--- a/src/arch/x86/include/librm.h
+++ b/src/arch/x86/include/librm.h
@@ -250,8 +250,10 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
/* CODE_DEFAULT: restore default .code32/.code64 directive */
#ifdef __x86_64__
#define CODE_DEFAULT ".code64"
+#define STACK_DEFAULT "q"
#else
#define CODE_DEFAULT ".code32"
+#define STACK_DEFAULT "l"
#endif
/* LINE_SYMBOL: declare a symbol for the current source code line */
@@ -268,7 +270,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
/* REAL_CODE: declare a fragment of code that executes in real mode */
#define REAL_CODE( asm_code_str ) \
- "push $1f\n\t" \
+ "push" STACK_DEFAULT " $1f\n\t" \
"call real_call\n\t" \
TEXT16_CODE ( "\n1:\n\t" \
asm_code_str \
@@ -277,7 +279,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
/* PHYS_CODE: declare a fragment of code that executes in flat physical mode */
#define PHYS_CODE( asm_code_str ) \
- "push $1f\n\t" \
+ "push" STACK_DEFAULT " $1f\n\t" \
"call phys_call\n\t" \
".section \".text.phys\", \"ax\", @progbits\n\t"\
"\n" LINE_SYMBOL "\n\t" \
--
2.44.0

9
ipxe.spec
View File

@ -6,7 +6,7 @@
Name: ipxe
Version: 1.21.1
Release: 4
Release: 5
Summary: A network boot loader
Epoch: 1
License: GPLv2 with additional permissions and BSD
@ -14,6 +14,7 @@ URL: http://ipxe.org/
Source0: https://github.com/ipxe/ipxe/archive/v%{version}.tar.gz
Patch0001: 0001-build-customize-configuration.patch
Patch0002: 0002-Use-spec-compliant-timeouts.patch
Patch0003: 0003-librm-Use-explicit-operand-size-when-pushing-a-label.patch
Patch6000: backport-avoid-infinite-loop-on-allocation-failure-in.patch
Patch6001: backport-ensure-that-pci_read_config-initialises-all-fields.patch
@ -191,6 +192,12 @@ cd ~/rpmbuild/BUILD/%{name}-%{version}/src/bin-i386-linux/
%endif
%changelog
* Fri Mar 15 2024 herengui <herengui@kylinsec.com.cn> - 1:1.21.1-5
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC: fix errors when compiling with binutils-2.41
* Wed Nov 23 2022 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:1.21.1-4
- Type:bugfix
- CVE:NA