From d8b1bb8edd99b2898720b4f10d292a67d532db48 Mon Sep 17 00:00:00 2001 From: "Francisco Blas Izquierdo Riera (klondike)" Date: Mon, 22 Oct 2018 15:29:36 +0800 Subject: [PATCH 4/4] Fix assemby textrels on rdrand_asm.S on PIC x86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch updates the fixes in the assembly in rdrand_asm.S in sys-apps/rng-tools-5 so it won't generate textrels on PIC systems. The main fixes are in the use of leal in SETPTR for such systems, the rest is the usual PIC support stuff. This should fix Gentoo bug #469962 and help fix #518210 This patch is released under the GPLv2 or a higher version license as is the original file as long as the author and the tester are credited. Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962 Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=518210 Signed-off-by: Francisco Blas Izquierdo Riera (klondike) Reported-by: cilly Reported-by: Manuel Rüger Tested-by: Anthony Basile Upstream-Status: Pending --- rdrand_asm.S | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/rdrand_asm.S b/rdrand_asm.S index b5d260a..7811cf2 100644 --- a/rdrand_asm.S +++ b/rdrand_asm.S @@ -2,6 +2,7 @@ * Copyright (c) 2011-2014, Intel Corporation * Authors: Fenghua Yu , * H. Peter Anvin + * PIC code by: Francisco Blas Izquierdo Riera (klondike) * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -172,7 +173,19 @@ ENTRY(x86_rdseed_or_rdrand_bytes) jmp 4b ENDPROC(x86_rdseed_or_rdrand_bytes) +#if defined(__PIC__) +#define INIT_PIC() \ + pushl %ebx ; \ + call __x86.get_pc_thunk.bx ; \ + addl $_GLOBAL_OFFSET_TABLE_, %ebx +#define END_PIC() \ + popl %ebx +#define SETPTR(var,ptr) leal (var)@GOTOFF(%ebx),ptr +#else +#define INIT_PIC() +#define END_PIC() #define SETPTR(var,ptr) movl $(var),ptr +#endif #define PTR0 %eax #define PTR1 %edx #define PTR2 %ecx @@ -188,6 +201,7 @@ ENTRY(x86_aes_mangle) movl 8(%ebp), %eax movl 12(%ebp), %edx push %esi + INIT_PIC() #endif movl $512, CTR3 /* Number of rounds */ @@ -278,6 +292,7 @@ offset = offset + 16 movdqa %xmm7, (7*16)(PTR1) #ifdef __i386__ + END_PIC() pop %esi pop %ebp #endif @@ -292,6 +307,7 @@ ENTRY(x86_aes_expand_key) push %ebp mov %esp, %ebp movl 8(%ebp), %eax + INIT_PIC() #endif SETPTR(aes_round_keys, PTR1) @@ -321,6 +337,7 @@ ENTRY(x86_aes_expand_key) call 1f #ifdef __i386__ + END_PIC() pop %ebp #endif ret @@ -341,6 +358,16 @@ ENTRY(x86_aes_expand_key) ENDPROC(x86_aes_expand_key) +#if defined(__i386__) && defined(__PIC__) + .section .text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat + .globl __x86.get_pc_thunk.bx + .hidden __x86.get_pc_thunk.bx + .type __x86.get_pc_thunk.bx, @function +__x86.get_pc_thunk.bx: + movl (%esp), %ebx + ret +#endif + .bss .balign 64 aes_round_keys: -- 2.7.4