From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Date: Wed, 4 Oct 2017 14:19:45 -0700 Message-Id: <20171004212003.28296-10-thgarnie@google.com> In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Subject: [kernel-hardening] [RFC v3 09/27] x86/acpi: Adapt assembly for PIE support To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Boris Ostrovsky , Alexey Dobriyan , Andrew Morton , Paul Gortmaker , Chris Metcalf , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Dou Liyang , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Masahiro Yamada , Alexei Starovoitov , Daniel Borkmann , Markus Trippelsdorf , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Rik van Riel , David Howells , Ard Biesheuvel , Waiman Long , Kyle Huey , Andrey Ryabinin , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , Rob Landley , "H . J . Lu" , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Cc: x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org, linux-sparse@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com List-ID: Change the assembly code to use only relative references of symbols for the kernel to be PIE compatible. Position Independent Executable (PIE) support will allow to extended the KASLR randomization range below the -2G memory limit. Signed-off-by: Thomas Garnier --- arch/x86/kernel/acpi/wakeup_64.S | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index 50b8ed0317a3..472659c0f811 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -14,7 +14,7 @@ * Hooray, we are in Long 64-bit mode (but still running in low memory) */ ENTRY(wakeup_long64) - movq saved_magic, %rax + movq saved_magic(%rip), %rax movq $0x123456789abcdef0, %rdx cmpq %rdx, %rax jne bogus_64_magic @@ -25,14 +25,14 @@ ENTRY(wakeup_long64) movw %ax, %es movw %ax, %fs movw %ax, %gs - movq saved_rsp, %rsp + movq saved_rsp(%rip), %rsp - movq saved_rbx, %rbx - movq saved_rdi, %rdi - movq saved_rsi, %rsi - movq saved_rbp, %rbp + movq saved_rbx(%rip), %rbx + movq saved_rdi(%rip), %rdi + movq saved_rsi(%rip), %rsi + movq saved_rbp(%rip), %rbp - movq saved_rip, %rax + movq saved_rip(%rip), %rax jmp *%rax ENDPROC(wakeup_long64) @@ -45,7 +45,7 @@ ENTRY(do_suspend_lowlevel) xorl %eax, %eax call save_processor_state - movq $saved_context, %rax + leaq saved_context(%rip), %rax movq %rsp, pt_regs_sp(%rax) movq %rbp, pt_regs_bp(%rax) movq %rsi, pt_regs_si(%rax) @@ -64,13 +64,14 @@ ENTRY(do_suspend_lowlevel) pushfq popq pt_regs_flags(%rax) - movq $.Lresume_point, saved_rip(%rip) + leaq .Lresume_point(%rip), %rax + movq %rax, saved_rip(%rip) - movq %rsp, saved_rsp - movq %rbp, saved_rbp - movq %rbx, saved_rbx - movq %rdi, saved_rdi - movq %rsi, saved_rsi + movq %rsp, saved_rsp(%rip) + movq %rbp, saved_rbp(%rip) + movq %rbx, saved_rbx(%rip) + movq %rdi, saved_rdi(%rip) + movq %rsi, saved_rsi(%rip) addq $8, %rsp movl $3, %edi @@ -82,7 +83,7 @@ ENTRY(do_suspend_lowlevel) .align 4 .Lresume_point: /* We don't restore %rax, it must be 0 anyway */ - movq $saved_context, %rax + leaq saved_context(%rip), %rax movq saved_context_cr4(%rax), %rbx movq %rbx, %cr4 movq saved_context_cr3(%rax), %rbx -- 2.14.2.920.gcf0c67979c-goog From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Subject: [RFC v3 09/27] x86/acpi: Adapt assembly for PIE support Date: Wed, 4 Oct 2017 14:19:45 -0700 Message-ID: <20171004212003.28296-10-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter Bor Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org List-Id: linux-arch.vger.kernel.org Q2hhbmdlIHRoZSBhc3NlbWJseSBjb2RlIHRvIHVzZSBvbmx5IHJlbGF0aXZlIHJlZmVyZW5jZXMg b2Ygc3ltYm9scyBmb3IgdGhlCmtlcm5lbCB0byBiZSBQSUUgY29tcGF0aWJsZS4KClBvc2l0aW9u IEluZGVwZW5kZW50IEV4ZWN1dGFibGUgKFBJRSkgc3VwcG9ydCB3aWxsIGFsbG93IHRvIGV4dGVu ZGVkIHRoZQpLQVNMUiByYW5kb21pemF0aW9uIHJhbmdlIGJlbG93IHRoZSAtMkcgbWVtb3J5IGxp bWl0LgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIEdhcm5pZXIgPHRoZ2FybmllQGdvb2dsZS5jb20+ Ci0tLQogYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0LlMgfCAzMSArKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0 LlMgYi9hcmNoL3g4Ni9rZXJuZWwvYWNwaS93YWtldXBfNjQuUwppbmRleCA1MGI4ZWQwMzE3YTMu LjQ3MjY1OWMwZjgxMSAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0 LlMKKysrIGIvYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0LlMKQEAgLTE0LDcgKzE0LDcg QEAKIAkgKiBIb29yYXksIHdlIGFyZSBpbiBMb25nIDY0LWJpdCBtb2RlIChidXQgc3RpbGwgcnVu bmluZyBpbiBsb3cgbWVtb3J5KQogCSAqLwogRU5UUlkod2FrZXVwX2xvbmc2NCkKLQltb3ZxCXNh dmVkX21hZ2ljLCAlcmF4CisJbW92cQlzYXZlZF9tYWdpYyglcmlwKSwgJXJheAogCW1vdnEJJDB4 MTIzNDU2Nzg5YWJjZGVmMCwgJXJkeAogCWNtcHEJJXJkeCwgJXJheAogCWpuZQlib2d1c182NF9t YWdpYwpAQCAtMjUsMTQgKzI1LDE0IEBAIEVOVFJZKHdha2V1cF9sb25nNjQpCiAJbW92dwklYXgs ICVlcwogCW1vdncJJWF4LCAlZnMKIAltb3Z3CSVheCwgJWdzCi0JbW92cQlzYXZlZF9yc3AsICVy c3AKKwltb3ZxCXNhdmVkX3JzcCglcmlwKSwgJXJzcAogCi0JbW92cQlzYXZlZF9yYngsICVyYngK LQltb3ZxCXNhdmVkX3JkaSwgJXJkaQotCW1vdnEJc2F2ZWRfcnNpLCAlcnNpCi0JbW92cQlzYXZl ZF9yYnAsICVyYnAKKwltb3ZxCXNhdmVkX3JieCglcmlwKSwgJXJieAorCW1vdnEJc2F2ZWRfcmRp KCVyaXApLCAlcmRpCisJbW92cQlzYXZlZF9yc2koJXJpcCksICVyc2kKKwltb3ZxCXNhdmVkX3Ji cCglcmlwKSwgJXJicAogCi0JbW92cQlzYXZlZF9yaXAsICVyYXgKKwltb3ZxCXNhdmVkX3JpcCgl cmlwKSwgJXJheAogCWptcAkqJXJheAogRU5EUFJPQyh3YWtldXBfbG9uZzY0KQogCkBAIC00NSw3 ICs0NSw3IEBAIEVOVFJZKGRvX3N1c3BlbmRfbG93bGV2ZWwpCiAJeG9ybAklZWF4LCAlZWF4CiAJ Y2FsbAlzYXZlX3Byb2Nlc3Nvcl9zdGF0ZQogCi0JbW92cQkkc2F2ZWRfY29udGV4dCwgJXJheAor CWxlYXEJc2F2ZWRfY29udGV4dCglcmlwKSwgJXJheAogCW1vdnEJJXJzcCwgcHRfcmVnc19zcCgl cmF4KQogCW1vdnEJJXJicCwgcHRfcmVnc19icCglcmF4KQogCW1vdnEJJXJzaSwgcHRfcmVnc19z aSglcmF4KQpAQCAtNjQsMTMgKzY0LDE0IEBAIEVOVFJZKGRvX3N1c3BlbmRfbG93bGV2ZWwpCiAJ cHVzaGZxCiAJcG9wcQlwdF9yZWdzX2ZsYWdzKCVyYXgpCiAKLQltb3ZxCSQuTHJlc3VtZV9wb2lu dCwgc2F2ZWRfcmlwKCVyaXApCisJbGVhcQkuTHJlc3VtZV9wb2ludCglcmlwKSwgJXJheAorCW1v dnEJJXJheCwgc2F2ZWRfcmlwKCVyaXApCiAKLQltb3ZxCSVyc3AsIHNhdmVkX3JzcAotCW1vdnEJ JXJicCwgc2F2ZWRfcmJwCi0JbW92cQklcmJ4LCBzYXZlZF9yYngKLQltb3ZxCSVyZGksIHNhdmVk X3JkaQotCW1vdnEJJXJzaSwgc2F2ZWRfcnNpCisJbW92cQklcnNwLCBzYXZlZF9yc3AoJXJpcCkK Kwltb3ZxCSVyYnAsIHNhdmVkX3JicCglcmlwKQorCW1vdnEJJXJieCwgc2F2ZWRfcmJ4KCVyaXAp CisJbW92cQklcmRpLCBzYXZlZF9yZGkoJXJpcCkKKwltb3ZxCSVyc2ksIHNhdmVkX3JzaSglcmlw KQogCiAJYWRkcQkkOCwgJXJzcAogCW1vdmwJJDMsICVlZGkKQEAgLTgyLDcgKzgzLDcgQEAgRU5U UlkoZG9fc3VzcGVuZF9sb3dsZXZlbCkKIAkuYWxpZ24gNAogLkxyZXN1bWVfcG9pbnQ6CiAJLyog V2UgZG9uJ3QgcmVzdG9yZSAlcmF4LCBpdCBtdXN0IGJlIDAgYW55d2F5ICovCi0JbW92cQkkc2F2 ZWRfY29udGV4dCwgJXJheAorCWxlYXEJc2F2ZWRfY29udGV4dCglcmlwKSwgJXJheAogCW1vdnEJ c2F2ZWRfY29udGV4dF9jcjQoJXJheCksICVyYngKIAltb3ZxCSVyYngsICVjcjQKIAltb3ZxCXNh dmVkX2NvbnRleHRfY3IzKCVyYXgpLCAlcmJ4Ci0tIAoyLjE0LjIuOTIwLmdjZjBjNjc5NzljLWdv b2cKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMu eGVuLm9yZy94ZW4tZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Subject: [RFC v3 09/27] x86/acpi: Adapt assembly for PIE support Date: Wed, 4 Oct 2017 14:19:45 -0700 Message-ID: <20171004212003.28296-10-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Bor Return-path: In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" List-Id: linux-crypto.vger.kernel.org Q2hhbmdlIHRoZSBhc3NlbWJseSBjb2RlIHRvIHVzZSBvbmx5IHJlbGF0aXZlIHJlZmVyZW5jZXMg b2Ygc3ltYm9scyBmb3IgdGhlCmtlcm5lbCB0byBiZSBQSUUgY29tcGF0aWJsZS4KClBvc2l0aW9u IEluZGVwZW5kZW50IEV4ZWN1dGFibGUgKFBJRSkgc3VwcG9ydCB3aWxsIGFsbG93IHRvIGV4dGVu ZGVkIHRoZQpLQVNMUiByYW5kb21pemF0aW9uIHJhbmdlIGJlbG93IHRoZSAtMkcgbWVtb3J5IGxp bWl0LgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIEdhcm5pZXIgPHRoZ2FybmllQGdvb2dsZS5jb20+ Ci0tLQogYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0LlMgfCAzMSArKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0 LlMgYi9hcmNoL3g4Ni9rZXJuZWwvYWNwaS93YWtldXBfNjQuUwppbmRleCA1MGI4ZWQwMzE3YTMu LjQ3MjY1OWMwZjgxMSAxMDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0 LlMKKysrIGIvYXJjaC94ODYva2VybmVsL2FjcGkvd2FrZXVwXzY0LlMKQEAgLTE0LDcgKzE0LDcg QEAKIAkgKiBIb29yYXksIHdlIGFyZSBpbiBMb25nIDY0LWJpdCBtb2RlIChidXQgc3RpbGwgcnVu bmluZyBpbiBsb3cgbWVtb3J5KQogCSAqLwogRU5UUlkod2FrZXVwX2xvbmc2NCkKLQltb3ZxCXNh dmVkX21hZ2ljLCAlcmF4CisJbW92cQlzYXZlZF9tYWdpYyglcmlwKSwgJXJheAogCW1vdnEJJDB4 MTIzNDU2Nzg5YWJjZGVmMCwgJXJkeAogCWNtcHEJJXJkeCwgJXJheAogCWpuZQlib2d1c182NF9t YWdpYwpAQCAtMjUsMTQgKzI1LDE0IEBAIEVOVFJZKHdha2V1cF9sb25nNjQpCiAJbW92dwklYXgs ICVlcwogCW1vdncJJWF4LCAlZnMKIAltb3Z3CSVheCwgJWdzCi0JbW92cQlzYXZlZF9yc3AsICVy c3AKKwltb3ZxCXNhdmVkX3JzcCglcmlwKSwgJXJzcAogCi0JbW92cQlzYXZlZF9yYngsICVyYngK LQltb3ZxCXNhdmVkX3JkaSwgJXJkaQotCW1vdnEJc2F2ZWRfcnNpLCAlcnNpCi0JbW92cQlzYXZl ZF9yYnAsICVyYnAKKwltb3ZxCXNhdmVkX3JieCglcmlwKSwgJXJieAorCW1vdnEJc2F2ZWRfcmRp KCVyaXApLCAlcmRpCisJbW92cQlzYXZlZF9yc2koJXJpcCksICVyc2kKKwltb3ZxCXNhdmVkX3Ji cCglcmlwKSwgJXJicAogCi0JbW92cQlzYXZlZF9yaXAsICVyYXgKKwltb3ZxCXNhdmVkX3JpcCgl cmlwKSwgJXJheAogCWptcAkqJXJheAogRU5EUFJPQyh3YWtldXBfbG9uZzY0KQogCkBAIC00NSw3 ICs0NSw3IEBAIEVOVFJZKGRvX3N1c3BlbmRfbG93bGV2ZWwpCiAJeG9ybAklZWF4LCAlZWF4CiAJ Y2FsbAlzYXZlX3Byb2Nlc3Nvcl9zdGF0ZQogCi0JbW92cQkkc2F2ZWRfY29udGV4dCwgJXJheAor CWxlYXEJc2F2ZWRfY29udGV4dCglcmlwKSwgJXJheAogCW1vdnEJJXJzcCwgcHRfcmVnc19zcCgl cmF4KQogCW1vdnEJJXJicCwgcHRfcmVnc19icCglcmF4KQogCW1vdnEJJXJzaSwgcHRfcmVnc19z aSglcmF4KQpAQCAtNjQsMTMgKzY0LDE0IEBAIEVOVFJZKGRvX3N1c3BlbmRfbG93bGV2ZWwpCiAJ cHVzaGZxCiAJcG9wcQlwdF9yZWdzX2ZsYWdzKCVyYXgpCiAKLQltb3ZxCSQuTHJlc3VtZV9wb2lu dCwgc2F2ZWRfcmlwKCVyaXApCisJbGVhcQkuTHJlc3VtZV9wb2ludCglcmlwKSwgJXJheAorCW1v dnEJJXJheCwgc2F2ZWRfcmlwKCVyaXApCiAKLQltb3ZxCSVyc3AsIHNhdmVkX3JzcAotCW1vdnEJ JXJicCwgc2F2ZWRfcmJwCi0JbW92cQklcmJ4LCBzYXZlZF9yYngKLQltb3ZxCSVyZGksIHNhdmVk X3JkaQotCW1vdnEJJXJzaSwgc2F2ZWRfcnNpCisJbW92cQklcnNwLCBzYXZlZF9yc3AoJXJpcCkK Kwltb3ZxCSVyYnAsIHNhdmVkX3JicCglcmlwKQorCW1vdnEJJXJieCwgc2F2ZWRfcmJ4KCVyaXAp CisJbW92cQklcmRpLCBzYXZlZF9yZGkoJXJpcCkKKwltb3ZxCSVyc2ksIHNhdmVkX3JzaSglcmlw KQogCiAJYWRkcQkkOCwgJXJzcAogCW1vdmwJJDMsICVlZGkKQEAgLTgyLDcgKzgzLDcgQEAgRU5U UlkoZG9fc3VzcGVuZF9sb3dsZXZlbCkKIAkuYWxpZ24gNAogLkxyZXN1bWVfcG9pbnQ6CiAJLyog V2UgZG9uJ3QgcmVzdG9yZSAlcmF4LCBpdCBtdXN0IGJlIDAgYW55d2F5ICovCi0JbW92cQkkc2F2 ZWRfY29udGV4dCwgJXJheAorCWxlYXEJc2F2ZWRfY29udGV4dCglcmlwKSwgJXJheAogCW1vdnEJ c2F2ZWRfY29udGV4dF9jcjQoJXJheCksICVyYngKIAltb3ZxCSVyYngsICVjcjQKIAltb3ZxCXNh dmVkX2NvbnRleHRfY3IzKCVyYXgpLCAlcmJ4Ci0tIAoyLjE0LjIuOTIwLmdjZjBjNjc5NzljLWdv b2cKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMu eGVuLm9yZy94ZW4tZGV2ZWwK