From: Russell King - ARM Linux <linux@armlinux.org.uk>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Kees Cook <keescook@chromium.org>,
kernel-hardening@lists.openwall.com,
Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [kernel-hardening] Re: [PATCH] ARM: fix randomized task_struct
Date: Fri, 30 Jun 2017 16:55:14 +0100 [thread overview]
Message-ID: <20170630155513.GA4902@n2100.armlinux.org.uk> (raw)
In-Reply-To: <9291740E-3BD1-454C-A3EB-46E35F073D0E@linaro.org>
On Fri, Jun 30, 2017 at 03:49:41PM +0000, Ard Biesheuvel wrote:
>
>
> > On 30 Jun 2017, at 15:34, Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > With the new task struct randomization, we can run into a build
> > failure for certain random seeds:
> >
> > arch/arm/kernel/entry-armv.S: Assembler messages:
> > arch/arm/kernel/entry-armv.S:803: Error: bad immediate value for offset (4096)
> >
> > Only two constants in asm-offset.h are affected, and I'm changing
> > both of them here to work correctly in all configurations.
> >
> > One more macro has the problem, but is currently unused, so this
> > removes it instead of adding complexity.
> >
> > Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Fixes: c33d8b12fbbd ("task_struct: Allow randomized layout")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > arch/arm/kernel/entry-armv.S | 5 ++++-
> > arch/arm/mm/proc-macros.S | 10 ++++------
> > 2 files changed, 8 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
> > index 9f157e7c51e7..db6d22b23bd8 100644
> > --- a/arch/arm/kernel/entry-armv.S
> > +++ b/arch/arm/kernel/entry-armv.S
> > @@ -797,7 +797,10 @@ ENTRY(__switch_to)
> > #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
> > ldr r7, [r2, #TI_TASK]
> > ldr r8, =__stack_chk_guard
> > - ldr r7, [r7, #TSK_STACK_CANARY]
> > + .if (TSK_STACK_CANARY > PAGE_MASK)
>
> Shouldn't this be ~PAGE_MASK?
>
> I think
>
> .if (TSK_STACK_CANARY & PAGE_MASK) != 0
>
> is better and clearer as well
It's not really that much clearer - what has any of this got to do with
the size of a page? Just because a definition appears to be numerically
the same, it doesn't mean it should be used!
The LDR instruction takes a maximum of a 12-bit constant. This 12-bit
constant has nothing to do with the page size; it's been that way since
the early ARMs that knew nothing about page tables.
Please instead create a LDR_IMM12_MASK or similar definition for this.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
WARNING: multiple messages have this Message-ID (diff)
From: linux@armlinux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: fix randomized task_struct
Date: Fri, 30 Jun 2017 16:55:14 +0100 [thread overview]
Message-ID: <20170630155513.GA4902@n2100.armlinux.org.uk> (raw)
In-Reply-To: <9291740E-3BD1-454C-A3EB-46E35F073D0E@linaro.org>
On Fri, Jun 30, 2017 at 03:49:41PM +0000, Ard Biesheuvel wrote:
>
>
> > On 30 Jun 2017, at 15:34, Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > With the new task struct randomization, we can run into a build
> > failure for certain random seeds:
> >
> > arch/arm/kernel/entry-armv.S: Assembler messages:
> > arch/arm/kernel/entry-armv.S:803: Error: bad immediate value for offset (4096)
> >
> > Only two constants in asm-offset.h are affected, and I'm changing
> > both of them here to work correctly in all configurations.
> >
> > One more macro has the problem, but is currently unused, so this
> > removes it instead of adding complexity.
> >
> > Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Fixes: c33d8b12fbbd ("task_struct: Allow randomized layout")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > arch/arm/kernel/entry-armv.S | 5 ++++-
> > arch/arm/mm/proc-macros.S | 10 ++++------
> > 2 files changed, 8 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
> > index 9f157e7c51e7..db6d22b23bd8 100644
> > --- a/arch/arm/kernel/entry-armv.S
> > +++ b/arch/arm/kernel/entry-armv.S
> > @@ -797,7 +797,10 @@ ENTRY(__switch_to)
> > #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
> > ldr r7, [r2, #TI_TASK]
> > ldr r8, =__stack_chk_guard
> > - ldr r7, [r7, #TSK_STACK_CANARY]
> > + .if (TSK_STACK_CANARY > PAGE_MASK)
>
> Shouldn't this be ~PAGE_MASK?
>
> I think
>
> .if (TSK_STACK_CANARY & PAGE_MASK) != 0
>
> is better and clearer as well
It's not really that much clearer - what has any of this got to do with
the size of a page? Just because a definition appears to be numerically
the same, it doesn't mean it should be used!
The LDR instruction takes a maximum of a 12-bit constant. This 12-bit
constant has nothing to do with the page size; it's been that way since
the early ARMs that knew nothing about page tables.
Please instead create a LDR_IMM12_MASK or similar definition for this.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
WARNING: multiple messages have this Message-ID (diff)
From: Russell King - ARM Linux <linux@armlinux.org.uk>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Kees Cook <keescook@chromium.org>,
kernel-hardening@lists.openwall.com,
Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: fix randomized task_struct
Date: Fri, 30 Jun 2017 16:55:14 +0100 [thread overview]
Message-ID: <20170630155513.GA4902@n2100.armlinux.org.uk> (raw)
In-Reply-To: <9291740E-3BD1-454C-A3EB-46E35F073D0E@linaro.org>
On Fri, Jun 30, 2017 at 03:49:41PM +0000, Ard Biesheuvel wrote:
>
>
> > On 30 Jun 2017, at 15:34, Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > With the new task struct randomization, we can run into a build
> > failure for certain random seeds:
> >
> > arch/arm/kernel/entry-armv.S: Assembler messages:
> > arch/arm/kernel/entry-armv.S:803: Error: bad immediate value for offset (4096)
> >
> > Only two constants in asm-offset.h are affected, and I'm changing
> > both of them here to work correctly in all configurations.
> >
> > One more macro has the problem, but is currently unused, so this
> > removes it instead of adding complexity.
> >
> > Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Fixes: c33d8b12fbbd ("task_struct: Allow randomized layout")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > arch/arm/kernel/entry-armv.S | 5 ++++-
> > arch/arm/mm/proc-macros.S | 10 ++++------
> > 2 files changed, 8 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
> > index 9f157e7c51e7..db6d22b23bd8 100644
> > --- a/arch/arm/kernel/entry-armv.S
> > +++ b/arch/arm/kernel/entry-armv.S
> > @@ -797,7 +797,10 @@ ENTRY(__switch_to)
> > #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP)
> > ldr r7, [r2, #TI_TASK]
> > ldr r8, =__stack_chk_guard
> > - ldr r7, [r7, #TSK_STACK_CANARY]
> > + .if (TSK_STACK_CANARY > PAGE_MASK)
>
> Shouldn't this be ~PAGE_MASK?
>
> I think
>
> .if (TSK_STACK_CANARY & PAGE_MASK) != 0
>
> is better and clearer as well
It's not really that much clearer - what has any of this got to do with
the size of a page? Just because a definition appears to be numerically
the same, it doesn't mean it should be used!
The LDR instruction takes a maximum of a 12-bit constant. This 12-bit
constant has nothing to do with the page size; it's been that way since
the early ARMs that knew nothing about page tables.
Please instead create a LDR_IMM12_MASK or similar definition for this.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
next prev parent reply other threads:[~2017-06-30 15:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-30 15:34 [kernel-hardening] [PATCH] ARM: fix randomized task_struct Arnd Bergmann
2017-06-30 15:34 ` Arnd Bergmann
2017-06-30 15:34 ` Arnd Bergmann
2017-06-30 15:49 ` [kernel-hardening] " Ard Biesheuvel
2017-06-30 15:49 ` Ard Biesheuvel
2017-06-30 15:49 ` Ard Biesheuvel
2017-06-30 15:55 ` Russell King - ARM Linux [this message]
2017-06-30 15:55 ` Russell King - ARM Linux
2017-06-30 15:55 ` Russell King - ARM Linux
2017-06-30 17:34 ` [kernel-hardening] " Ard Biesheuvel
2017-06-30 17:34 ` Ard Biesheuvel
2017-06-30 17:34 ` Ard Biesheuvel
2017-06-30 15:55 ` [kernel-hardening] " Arnd Bergmann
2017-06-30 15:55 ` Arnd Bergmann
2017-06-30 15:55 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170630155513.GA4902@n2100.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.