linux-kernel - [PATCH] x86/boot: fix kaslr-enabled build

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: <20200129162926.1006-1-sergey.senozhatsky@gmail.com>
Date:   Thu, 30 Jan 2020 01:29:26 +0900
From:   Sergey Senozhatsky <sergey.senozhatsky@...il.com>
To:     Thomas Gleixner <tglx@...utronix.de>
Cc:     Borislav Petkov <bp@...en8.de>, Peter Anvin <hpa@...or.com>,
        x86@...nel.org, linux-kernel@...r.kernel.org,
        Sergey Senozhatsky <sergey.senozhatsky@...il.com>
Subject: [PATCH] x86/boot: fix kaslr-enabled build

Both pgtable_64 and kaslr_64 define `__force_order', which breaks
the build:

ld: arch/x86/boot/compressed/pgtable_64.o:(.bss+0x0): multiple definition of `__force_order';
arch/x86/boot/compressed/kaslr_64.o:(.bss+0x0): first defined here

Make KASLR use extern pgtable_64's definition.

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@...il.com>
---
 arch/x86/boot/compressed/kaslr_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/boot/compressed/kaslr_64.c b/arch/x86/boot/compressed/kaslr_64.c
index 748456c365f4..274df8f9e659 100644
--- a/arch/x86/boot/compressed/kaslr_64.c
+++ b/arch/x86/boot/compressed/kaslr_64.c
@@ -30,7 +30,7 @@
 #include "../../mm/ident_map.c"
 
 /* Used by pgtable.h asm code to force instruction serialization. */
-unsigned long __force_order;
+extern unsigned long __force_order;
 
 /* Used to track our page table allocation area. */
 struct alloc_pgt_data {
-- 
2.25.0