From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756626Ab1JCP4k (ORCPT ); Mon, 3 Oct 2011 11:56:40 -0400 Received: from mail-vx0-f174.google.com ([209.85.220.174]:39700 "EHLO mail-vx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756564Ab1JCP4f (ORCPT ); Mon, 3 Oct 2011 11:56:35 -0400 Date: Mon, 3 Oct 2011 11:56:21 -0400 (EDT) From: Nicolas Pitre To: Jiri Kosina cc: Josh Boyer , Andrew Morton , Ingo Molnar , hongjiu.lu@intel.com, linux-kernel@vger.kernel.org, Andrew Morton , Russell King Subject: Re: [PATCH v2] binfmt_elf: Fix PIE execution with randomization disabled (was Re: [RFC PATCH] binfmt_elf: Fix PIE execution with randomization disabled) In-Reply-To: Message-ID: References: <20110929195359.GJ16720@zod.bos.redhat.com> <20110929141929.43df799d.akpm00@gmail.com> <20110930021629.GL16720@zod.bos.redhat.com> <20111003150345.GP16720@zod.bos.redhat.com> User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 3 Oct 2011, Jiri Kosina wrote: > How about the patch below instead? It survives my testing, and I believe > it handles both cases properly. > > Confirmation from the original bug reporter would obviously be a nice > bonus too :) > > > > > From: Jiri Kosina > Subject: [PATCH] binfmt_elf: fix PIE execution with randomization disabled > > The case of address space randomization being disabled in runtime through > randomize_va_space sysctl is not treated properly in load_elf_binary(), > resulting in SIGKILL coming at exec() time for certain PIE-linked binaries > in case the randomization has been disabled at runtime prior to calling > exec(). > > Handle the randomize_va_space == 0 case the same way as if we were not > supporting .text randomization at all. > > Based on original patch by H.J. Lu and > Josh Boyer > > Cc: Ingo Molnar > Cc: Jiri Kosina > Cc: Nicolas Pitre > Cc: Russell King > Signed-off-by: Jiri Kosina Acked-by: Nicolas Pitre However I'd suggest a change to deal with style issues: > diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c > index dd0fdfc..bb11fe4 100644 > --- a/fs/binfmt_elf.c > +++ b/fs/binfmt_elf.c > @@ -795,7 +795,10 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) > * might try to exec. This is because the brk will > * follow the loader, and is not movable. */ > #if defined(CONFIG_X86) || defined(CONFIG_ARM) > - load_bias = 0; > + if (current->flags & PF_RANDOMIZE) > + load_bias = 0; > + else > + load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); > #else > load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); > #endif What about this instead, saving 3 lines out of 8: load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); #if defined(CONFIG_X86) || defined(CONFIG_ARM) if (current->flags & PF_RANDOMIZE) load_bias = 0; #endif ? Nicolas