From patchwork Tue Apr 18 17:01:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 9685891 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C63C60375 for ; Tue, 18 Apr 2017 17:01:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A6B9205A4 for ; Tue, 18 Apr 2017 17:01:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E2C4283FE; Tue, 18 Apr 2017 17:01:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE2EF205A4 for ; Tue, 18 Apr 2017 17:01:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932347AbdDRRBY (ORCPT ); Tue, 18 Apr 2017 13:01:24 -0400 Received: from foss.arm.com ([217.140.101.70]:58956 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755222AbdDRRBX (ORCPT ); Tue, 18 Apr 2017 13:01:23 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E21EDB16; Tue, 18 Apr 2017 10:01:22 -0700 (PDT) Received: from e104818-lin.cambridge.arm.com (e104818-lin.cambridge.arm.com [10.1.206.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 79B003F41F; Tue, 18 Apr 2017 10:01:21 -0700 (PDT) Date: Tue, 18 Apr 2017 18:01:18 +0100 From: Catalin Marinas To: "dongbo (E)" Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, "linux-kernel@vger.kernel.org" , Mark Rutland , will.deacon@arm.com, Linuxarm , linux-arm-kernel@lists.infradead.org, Peter Maydell Subject: Re: [PATCH] fs: Preventing READ_IMPLIES_EXEC Propagation Message-ID: <20170418170118.GH27592@e104818-lin.cambridge.arm.com> References: <1492088223-98232-1-git-send-email-zhangshaokun@hisilicon.com> <2414e3b3-03f6-bd6c-5aa4-ad58c66b5aa5@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <2414e3b3-03f6-bd6c-5aa4-ad58c66b5aa5@huawei.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Apr 13, 2017 at 08:33:52PM +0800, dongbo (E) wrote: > From: Dong Bo > > In load_elf_binary(), once the READ_IMPLIES_EXEC flag is set, > the flag is propagated to its child processes, even the elf > files are marked as not requiring executable stack. It may > cause superfluous operations on some arch, e.g. > __sync_icache_dcache on aarch64 due to a PROT_READ mmap is > also marked as PROT_EXEC. > > Signed-off-by: Dong Bo > --- > fs/binfmt_elf.c | 2 ++ > fs/binfmt_elf_fdpic.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c > index 5075fd5..c52e670 100644 > --- a/fs/binfmt_elf.c > +++ b/fs/binfmt_elf.c > @@ -863,6 +863,8 @@ static int load_elf_binary(struct linux_binprm *bprm) > SET_PERSONALITY2(loc->elf_ex, &arch_state); > if (elf_read_implies_exec(loc->elf_ex, executable_stack)) > current->personality |= READ_IMPLIES_EXEC; > + else > + current->personality &= ~READ_IMPLIES_EXEC; > if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) > current->flags |= PF_RANDOMIZE; > diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c > index cf93a4f..c4bc4d0 100644 > --- a/fs/binfmt_elf_fdpic.c > +++ b/fs/binfmt_elf_fdpic.c > @@ -354,6 +354,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm) > set_personality(PER_LINUX); > if (elf_read_implies_exec(&exec_params.hdr, executable_stack)) > current->personality |= READ_IMPLIES_EXEC; > + else > + current->personality &= ~READ_IMPLIES_EXEC; > setup_new_exec(bprm); That's affecting most architectures with a risk of ABI breakage. We could do it on arm64 only, though I'm not yet clear on the ABI implications (at a first look, there shouldn't be any). This follows the x86_64 approach but unfortunately we haven't done it on arm64 from the start: diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 5d1700425efe..5941e7f6ae60 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -142,6 +142,7 @@ typedef struct user_fpsimd_state elf_fpregset_t; ({ \ clear_bit(TIF_32BIT, ¤t->mm->context.flags); \ clear_thread_flag(TIF_32BIT); \ + current->personality &= ~READ_IMPLIES_EXEC; \ }) /* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */