Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752597AbdFURX4 (ORCPT <rfc822;w@1wt.eu>);
        Wed, 21 Jun 2017 13:23:56 -0400
Received: from mail-io0-f171.google.com ([209.85.223.171]:35729 "EHLO
        mail-io0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752068AbdFURXy (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 21 Jun 2017 13:23:54 -0400
MIME-Version: 1.0
In-Reply-To: <1498046876.13083.17.camel@redhat.com>
References: <20170621055835.GA27467@beast> <1498046876.13083.17.camel@redhat.com>
From: Kees Cook <keescook@chromium.org>
Date: Wed, 21 Jun 2017 10:23:52 -0700
X-Google-Sender-Auth: slVNVjgyOClCvk7eMaTwEUMrMGA
Message-ID: <CAGXu5j+LJ7241o9xoXrorc-Wt9Z7YWOvkPjkxSMuGn6TtCFkgQ@mail.gmail.com>
Subject: Re: [kernel-hardening] [PATCH] [RFC] binfmt_elf: Use ELF_ET_DYN_BASE
 only for PIE
To: Rik van Riel <riel@redhat.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
        Daniel Micay <danielmicay@gmail.com>,
        Qualys Security Advisory <qsa@qualys.com>,
        Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>, "x86@kernel.org" <x86@kernel.org>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        Dmitry Safonov <dsafonov@virtuozzo.com>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Grzegorz Andrejczuk <grzegorz.andrejczuk@intel.com>,
        "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
        "kernel-hardening@lists.openwall.com" 
        <kernel-hardening@lists.openwall.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1834
Lines: 54

On Wed, Jun 21, 2017 at 5:07 AM, Rik van Riel <riel@redhat.com> wrote:
> On Tue, 2017-06-20 at 22:58 -0700, Kees Cook wrote:
>> +/* This is the base location for PIE (ET_DYN with INTERP) loads. */
>> +#define ELF_ET_DYN_BASE              0x400000UL
>
> This value is good for 32 bit binaries, but for 64
> bit binaries you probably want to put ELF_ET_DYN_BASE
> at 4GB or higher.
>
> The latter is necessary because Android uses the
> lower 4GB of address space for its JVM runtime,
> with 32 bit pointers inside that part of the otherwise
> 64 bit address space.
>
> In other words:
>
> #define ELF_ET_DYN_BASE (mmap_is_ia32() ? 0x400000UL : 0x100000000UL)

Ah, interesting. Okay, that should be fine. I'll adjust it.

>> +++ b/fs/binfmt_elf.c
>>
>> +                      * Therefore, programs are loaded offset
>> from
>> +                      * ELF_ET_DYN_BASE and loaders are loaded
>> into the
>> +                      * independently randomized mmap region (0
>> load_bias
>> +                      * without MAP_FIXED).
>> +                      */
>> +                     if (elf_interpreter) {
>> +                             load_bias = ELF_ET_DYN_BASE;
>> +                             if (current->flags & PF_RANDOMIZE)
>> +                                     load_bias +=
>> arch_mmap_rnd();
>> +                             elf_flags |= MAP_FIXED;
>> +                     } else
>> +                             load_bias = 0;
>> +
>> +                     load_bias -= vaddr;
>
> I like this, and the big comment telling people how it
> works :)

Thanks! It looks like your patch for commenting load_bias never got
picked up, so I've added some more comments for that and some other
things too. (Mostly for all the stuff I have to read a few times when
I look at this code.)

-Kees

-- 
Kees Cook
Pixel Security