Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3775880ybi; Mon, 10 Jun 2019 16:52:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqxBeHUCj7JpfikEmRtUHVyec3FHg9ZxuNiutBU5ZmdC3PSf8ebPHcw+DHaIjZs+kwsteWiU X-Received: by 2002:a65:6104:: with SMTP id z4mr17846403pgu.319.1560210752473; Mon, 10 Jun 2019 16:52:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560210752; cv=none; d=google.com; s=arc-20160816; b=iDO1ExBswh7aJ6QfsaE7pZX2gOz8nnfVKA54A7RMd+ZeVD5bRq4wfBsxA8bJ7SdaDF Wf8tzqaBzA6GCWJVZNbPY8AHwb/SOIUponeVc5ah4+/aPV+m9cY9gBfcxEM1qmxaFmWh SHdm5dbQGMDntU6AJoGSijOdaFVLH0loBxfedM0YvgsL+itUHWJiwdFrDrwSZ3SFlp4/ rNGEha0gl7RKdtZk+efnBS0PS85mGRy4YqdD3Eloe/rrpRqiOLF0hXZp/rfiL09Y/yXv 5UP413TL0hgbyy1zMQwYzrX3/50ExHsAZIcMLqxjBYAn+h0a7KgeedJm2+8Coo1CbEQH hw4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=zTMxpEEXAhPalCGk2uwvI4Mw2/TbyDqYYFDJpjeMgJM=; b=nVeSdj9EV4HchRrfbScCXSrNGLUujACzax7jTYCDK/fossuYhmxz1FPszU8cU2nMcM W/4V65Kgja/xTwbwocsNfIgEYGnxnWpJdMW5//dB+3jo4P7b/OEJAmjDUaKq5EKGIBes J0YeCbutmSlCmvaocInXoahwWb+flTzM2Jcoo+PJ1tdtbLUuHWFZGZMJ2DKRM2dWt3Nq lqtW8ASENG/T0Bq23wYc5oMqAtLMjhzaQ4g8zO2WQQnzYwFwVfRECtfMfRF/WYPv3RZS 1LSVmGjBy5bxs1HHpODqhGre2Bc6iUTBSZ4PWKHmjurAcYgdY8yBsn5Fe6+LWVc1skA8 jFew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="CA/9jjUG"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w10si767171pjq.100.2019.06.10.16.52.17; Mon, 10 Jun 2019 16:52:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="CA/9jjUG"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390828AbfFJXwI (ORCPT + 99 others); Mon, 10 Jun 2019 19:52:08 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:44890 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390682AbfFJXwF (ORCPT ); Mon, 10 Jun 2019 19:52:05 -0400 Received: by mail-pl1-f194.google.com with SMTP id t7so1655130plr.11 for ; Mon, 10 Jun 2019 16:52:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=zTMxpEEXAhPalCGk2uwvI4Mw2/TbyDqYYFDJpjeMgJM=; b=CA/9jjUGtQ1g8jH3eI7LaH1zTRGcBGM6SIXNKdkqtIKxVMJ52CM8PTouVpZI532u8j ujrtQ/dbZ8tEkdej07Kn9Lf2dtpz5B6iMdvzCi0kZHyDAN65FbQPSY2W1MdE62/VJNFD DokqiXe3WIqy3Tj6Zsjmbq181/8BklVk2IFTM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=zTMxpEEXAhPalCGk2uwvI4Mw2/TbyDqYYFDJpjeMgJM=; b=k3sq9AuYAUxay7eiLTQVX+JAFclVi5HWAmSelofTaERc3OYPHWfVNH3oHdeuIEOGEn jTmGH/KDi0TyiLU2kVnmmFYObJ4NKjuwCQH1ydGj9OU/UEcaBV0XEnV+ooRvOFboJkzS X2s97rn+kFbbEYosa3iehHvUgIzFH6tWI8lJa8tc9Zh+Unkc7XldgcTBvjYo9vPItovi fcm7U/JpHx8PRRYN90A4w7rJOSrCRw9VBfJT5xXPnLe9Gm1HGilAchSp9OxHSHFXPpqE lUooJPGZdIDLYWmo/IyiKUnaHjVZVD9UVd2fAX0RPxS3c8LNPl0uo9GnkvzN/IIEKXgy Bv+g== X-Gm-Message-State: APjAAAXTE8fDXt+QigUKGXMXI4wWglKsO8JYY2qwPJTOR1GQft/UqPjS paC7i9rLf5IKP63cJRpSFKcQlA== X-Received: by 2002:a17:902:a708:: with SMTP id w8mr69255143plq.162.1560210724170; Mon, 10 Jun 2019 16:52:04 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id y4sm11934800pgc.85.2019.06.10.16.52.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Jun 2019 16:52:03 -0700 (PDT) Date: Mon, 10 Jun 2019 16:52:02 -0700 From: Kees Cook To: Thomas Garnier Cc: kernel-hardening@lists.openwall.com, kristen@linux.intel.com, Thomas Garnier , Pavel Machek , "Rafael J . Wysocki" , "Rafael J. Wysocki" , Len Brown , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 08/12] x86/acpi: Adapt assembly for PIE support Message-ID: <201906101652.CA88F8F@keescook> References: <20190520231948.49693-1-thgarnie@chromium.org> <20190520231948.49693-9-thgarnie@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190520231948.49693-9-thgarnie@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 20, 2019 at 04:19:33PM -0700, Thomas Garnier wrote: > From: Thomas Garnier > > 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 extend the > KASLR randomization range below 0xffffffff80000000. > > Signed-off-by: Thomas Garnier Reviewed-by: Kees Cook -Kees > Acked-by: Pavel Machek > Acked-by: Rafael J. Wysocki > --- > 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 510fa12aab73..e080e943e295 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.21.0.1020.gf2820cf01a-goog > -- Kees Cook