From patchwork Thu Apr 13 12:33:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Bo X-Patchwork-Id: 9679347 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 DFE9460381 for ; Thu, 13 Apr 2017 12:34:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF34228606 for ; Thu, 13 Apr 2017 12:34:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3B3A28654; Thu, 13 Apr 2017 12:34:25 +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 E500928606 for ; Thu, 13 Apr 2017 12:34:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751235AbdDMMeL (ORCPT ); Thu, 13 Apr 2017 08:34:11 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:5328 "EHLO dggrg01-dlp.huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751083AbdDMMeK (ORCPT ); Thu, 13 Apr 2017 08:34:10 -0400 Received: from 172.30.72.53 (EHLO DGGEML404-HUB.china.huawei.com) ([172.30.72.53]) by dggrg01-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AMN33626; Thu, 13 Apr 2017 20:34:04 +0800 (CST) Received: from [127.0.0.1] (10.63.194.120) by DGGEML404-HUB.china.huawei.com (10.3.17.39) with Microsoft SMTP Server id 14.3.301.0; Thu, 13 Apr 2017 20:33:54 +0800 Subject: [PATCH] fs: Preventing READ_IMPLIES_EXEC Propagation References: <1492088223-98232-1-git-send-email-zhangshaokun@hisilicon.com> To: , , "linux-kernel@vger.kernel.org" CC: Mark Rutland , Linuxarm , , , From: "dongbo (E)" X-Forwarded-Message-Id: <1492088223-98232-1-git-send-email-zhangshaokun@hisilicon.com> Message-ID: <2414e3b3-03f6-bd6c-5aa4-ad58c66b5aa5@huawei.com> Date: Thu, 13 Apr 2017 20:33:52 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <1492088223-98232-1-git-send-email-zhangshaokun@hisilicon.com> X-Originating-IP: [10.63.194.120] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.58EF703D.020D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: ddaecb59e54ef4079f2d1d1c33acd35d 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 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); -- 1.9.1