linux-kernel - [PATCH V3 request from stable 3.10 to 3.14] efi: fix 32bit kernel boot failed problem using efi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1438653081-25746-1-git-send-email-fupan.li@windriver.com>
Date:	Tue, 4 Aug 2015 09:51:21 +0800
From:	<fupan.li@...driver.com>
To:	<gregkh@...uxfoundation.org>, <matt@...eblueprint.co.uk>
CC:	<jslaby@...e.cz>, <linux-efi@...r.kernel.org>,
	<stable@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	<fupanli@...il.com>, <ben@...adent.org.uk>
Subject: [PATCH V3 request from stable 3.10 to 3.14] efi: fix 32bit kernel boot failed problem using efi

From: Fupan Li <fupan.li@...driver.com>

Commit 35d5134b7d5a
("x86/efi: Correct EFI boot stub use of code32_start")
imported a bug, which will cause 32bit kernel boot failed
using efi method. It should use the label's address instead
of the value stored in the label to caculate the address of
code32_start.

Signed-off-by: Fupan Li <fupan.li@...driver.com>
---
 arch/x86/boot/compressed/head_32.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index abb988a..3b28eff 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -54,7 +54,7 @@ ENTRY(efi_pe_entry)
 	call	reloc
 reloc:
 	popl	%ecx
-	subl	reloc, %ecx
+	subl	$reloc, %ecx
 	movl	%ecx, BP_code32_start(%eax)
 
 	sub	$0x4, %esp
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/