From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CEAEC47083 for ; Wed, 2 Jun 2021 15:13:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 287C561246 for ; Wed, 2 Jun 2021 15:13:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231617AbhFBPPD (ORCPT ); Wed, 2 Jun 2021 11:15:03 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:3517 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231200AbhFBPPB (ORCPT ); Wed, 2 Jun 2021 11:15:01 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4FwCBv15T3zYq3W; Wed, 2 Jun 2021 23:10:31 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 2 Jun 2021 23:13:15 +0800 Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 2 Jun 2021 23:13:15 +0800 Subject: Re: [PATCH v2 7/7] ARM: mm: Fix PXN process with LPAE feature To: "Russell King (Oracle)" CC: , Catalin Marinas , , Andrew Morton , Jungseung Lee References: <20210602070246.83990-1-wangkefeng.wang@huawei.com> <20210602070246.83990-8-wangkefeng.wang@huawei.com> <20210602105255.GK30436@shell.armlinux.org.uk> From: Kefeng Wang Message-ID: <62f08378-85e7-2a07-3fd0-b287047ce1b5@huawei.com> Date: Wed, 2 Jun 2021 23:13:14 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20210602105255.GK30436@shell.armlinux.org.uk> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/6/2 18:52, Russell King (Oracle) wrote: > Hi, > > On Wed, Jun 02, 2021 at 03:02:46PM +0800, Kefeng Wang wrote: >> When user code execution with privilege mode, it will lead to >> infinite loop in the page fault handler if ARM_LPAE enabled, >> >> The issue could be reproduced with >> "echo EXEC_USERSPACE > /sys/kernel/debug/provoke-crash/DIRECT" >> >> Lets' fix it by adding the check in do_page_fault() and panic >> when ARM_LPAE enabled. >> >> Fixes: 1d4d37159d01 ("ARM: 8235/1: Support for the PXN CPU feature on ARMv7") >> Signed-off-by: Kefeng Wang >> --- >> arch/arm/mm/fault.c | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c >> index 7cfa9a59d3ec..279bbeb33b48 100644 >> --- a/arch/arm/mm/fault.c >> +++ b/arch/arm/mm/fault.c >> @@ -257,8 +257,14 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) >> vm_flags = VM_WRITE; >> } >> >> - if (fsr & FSR_LNX_PF) >> + if (fsr & FSR_LNX_PF) { >> vm_flags = VM_EXEC; >> +#ifdef CONFIG_ARM_LPAE >> + if (addr && addr < TASK_SIZE && !user_mode(regs)) >> + die_kernel_fault("execution of user memory", >> + addr, fsr, regs); >> +#endif >> + } > Do we need to do this test here? > > Also, is this really LPAE specific? We have similar protection on 32-bit > ARM using domains to disable access to userspace except when the user > accessors are being used, so I would expect kernel-mode execution to > also cause a fault there.   IFSR format when using the Short-descriptor translation table format     Domain fault      01001            First level   01011     Second level     Permission fault 01101            First level   01111     Second level   IFSR format when using the Long-descriptor translation table format    0011LL Permission fault. LL bits indicate levelb. After check the ARM spec, I think for the permission fault,  we should panic with or without LPAE, will change to diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 7cfa9a59d3ec..dd97d9b19dec 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -257,8 +257,11 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)                 vm_flags = VM_WRITE;         } -       if (fsr & FSR_LNX_PF) +       if (fsr & FSR_LNX_PF) {                 vm_flags = VM_EXEC; +               if (!user_mode(regs)) +                       die_kernel_fault("execution of memory", addr, fsr, regs); +       }         perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); If no object, I will send all patches with updates to  patch system,  thanks. > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0598EC4708F for ; Wed, 2 Jun 2021 15:15:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C433D61075 for ; Wed, 2 Jun 2021 15:15:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C433D61075 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:CC:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=amLd8kCFPlXAOnl8o3a2ZcUhs0rWJb5tG08R/Hi5V+w=; b=HlCRRd9pcmAvT0RpFMbbdfyI8R BI9AN9qxLiFfZ/OcPjdT2Hvuqu5w94Ne9HXL72INhl2AIRuR850ZbqYcGvAf2CV5MYA8Ol+HfiZso +GmCbsWV3A9K1THTZrF/iI1BRpqNYx4hpEPX709zpJlO3CD9RxtIKirDYQ0zpN81SvTyd3LTMdhJu +OxQMaaiNqKa74V1dFBS2Fo61xe8/Wd1A7qEuQHtgXKDWqXoC3Xl+gGU07enSnOQ8vL3n5g2hEMEb cSwq90qaPNBa1uOAbM5srC9Hs9N2WYBE/pgYNOZhHjtlSCj2OjS/1vsxZQcAvKxsNto1oupUjOHvi g4r1b6vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loSYl-004mVR-AA; Wed, 02 Jun 2021 15:13:31 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loSYh-004mUB-7b for linux-arm-kernel@lists.infradead.org; Wed, 02 Jun 2021 15:13:29 +0000 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4FwCBv15T3zYq3W; Wed, 2 Jun 2021 23:10:31 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 2 Jun 2021 23:13:15 +0800 Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 2 Jun 2021 23:13:15 +0800 Subject: Re: [PATCH v2 7/7] ARM: mm: Fix PXN process with LPAE feature To: "Russell King (Oracle)" CC: , Catalin Marinas , , Andrew Morton , Jungseung Lee References: <20210602070246.83990-1-wangkefeng.wang@huawei.com> <20210602070246.83990-8-wangkefeng.wang@huawei.com> <20210602105255.GK30436@shell.armlinux.org.uk> From: Kefeng Wang Message-ID: <62f08378-85e7-2a07-3fd0-b287047ce1b5@huawei.com> Date: Wed, 2 Jun 2021 23:13:14 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20210602105255.GK30436@shell.armlinux.org.uk> Content-Language: en-US X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210602_081327_823755_391F4B08 X-CRM114-Status: GOOD ( 24.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Ck9uIDIwMjEvNi8yIDE4OjUyLCBSdXNzZWxsIEtpbmcgKE9yYWNsZSkgd3JvdGU6Cj4gSGksCj4K PiBPbiBXZWQsIEp1biAwMiwgMjAyMSBhdCAwMzowMjo0NlBNICswODAwLCBLZWZlbmcgV2FuZyB3 cm90ZToKPj4gV2hlbiB1c2VyIGNvZGUgZXhlY3V0aW9uIHdpdGggcHJpdmlsZWdlIG1vZGUsIGl0 IHdpbGwgbGVhZCB0bwo+PiBpbmZpbml0ZSBsb29wIGluIHRoZSBwYWdlIGZhdWx0IGhhbmRsZXIg aWYgQVJNX0xQQUUgZW5hYmxlZCwKPj4KPj4gVGhlIGlzc3VlIGNvdWxkIGJlIHJlcHJvZHVjZWQg d2l0aAo+PiAgICAiZWNobyBFWEVDX1VTRVJTUEFDRSA+IC9zeXMva2VybmVsL2RlYnVnL3Byb3Zv a2UtY3Jhc2gvRElSRUNUIgo+Pgo+PiBMZXRzJyBmaXggaXQgYnkgYWRkaW5nIHRoZSBjaGVjayBp biBkb19wYWdlX2ZhdWx0KCkgYW5kIHBhbmljCj4+IHdoZW4gQVJNX0xQQUUgZW5hYmxlZC4KPj4K Pj4gRml4ZXM6IDFkNGQzNzE1OWQwMSAoIkFSTTogODIzNS8xOiBTdXBwb3J0IGZvciB0aGUgUFhO IENQVSBmZWF0dXJlIG9uIEFSTXY3IikKPj4gU2lnbmVkLW9mZi1ieTogS2VmZW5nIFdhbmcgPHdh bmdrZWZlbmcud2FuZ0BodWF3ZWkuY29tPgo+PiAtLS0KPj4gICBhcmNoL2FybS9tbS9mYXVsdC5j IHwgOCArKysrKysrLQo+PiAgIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21tL2ZhdWx0LmMgYi9hcmNoL2Fy bS9tbS9mYXVsdC5jCj4+IGluZGV4IDdjZmE5YTU5ZDNlYy4uMjc5YmJlYjMzYjQ4IDEwMDY0NAo+ PiAtLS0gYS9hcmNoL2FybS9tbS9mYXVsdC5jCj4+ICsrKyBiL2FyY2gvYXJtL21tL2ZhdWx0LmMK Pj4gQEAgLTI1Nyw4ICsyNTcsMTQgQEAgZG9fcGFnZV9mYXVsdCh1bnNpZ25lZCBsb25nIGFkZHIs IHVuc2lnbmVkIGludCBmc3IsIHN0cnVjdCBwdF9yZWdzICpyZWdzKQo+PiAgIAkJdm1fZmxhZ3Mg PSBWTV9XUklURTsKPj4gICAJfQo+PiAgIAo+PiAtCWlmIChmc3IgJiBGU1JfTE5YX1BGKQo+PiAr CWlmIChmc3IgJiBGU1JfTE5YX1BGKSB7Cj4+ICAgCQl2bV9mbGFncyA9IFZNX0VYRUM7Cj4+ICsj aWZkZWYgQ09ORklHX0FSTV9MUEFFCj4+ICsJCWlmIChhZGRyICYmIGFkZHIgPCBUQVNLX1NJWkUg JiYgIXVzZXJfbW9kZShyZWdzKSkKPj4gKwkJCWRpZV9rZXJuZWxfZmF1bHQoImV4ZWN1dGlvbiBv ZiB1c2VyIG1lbW9yeSIsCj4+ICsJCQkJCSBhZGRyLCBmc3IsIHJlZ3MpOwo+PiArI2VuZGlmCj4+ ICsJfQo+IERvIHdlIG5lZWQgdG8gZG8gdGhpcyB0ZXN0IGhlcmU/Cj4KPiBBbHNvLCBpcyB0aGlz IHJlYWxseSBMUEFFIHNwZWNpZmljPyBXZSBoYXZlIHNpbWlsYXIgcHJvdGVjdGlvbiBvbiAzMi1i aXQKPiBBUk0gdXNpbmcgZG9tYWlucyB0byBkaXNhYmxlIGFjY2VzcyB0byB1c2Vyc3BhY2UgZXhj ZXB0IHdoZW4gdGhlIHVzZXIKPiBhY2Nlc3NvcnMgYXJlIGJlaW5nIHVzZWQsIHNvIEkgd291bGQg ZXhwZWN0IGtlcm5lbC1tb2RlIGV4ZWN1dGlvbiB0bwo+IGFsc28gY2F1c2UgYSBmYXVsdCB0aGVy ZS4KIMKgIElGU1IgZm9ybWF0IHdoZW4gdXNpbmcgdGhlIFNob3J0LWRlc2NyaXB0b3IgdHJhbnNs YXRpb24gdGFibGUgZm9ybWF0CgogwqDCoMKgIERvbWFpbiBmYXVsdCDCoCDCoMKgIDAxMDAxwqDC oMKgIMKgwqDCoCDCoMKgwqAgRmlyc3QgbGV2ZWzCoMKgIDAxMDExIMKgwqDCoCBTZWNvbmQgbGV2 ZWwKCiDCoMKgwqAgUGVybWlzc2lvbiBmYXVsdCAwMTEwMSDCoMKgIMKgwqDCoCDCoMKgwqAgRmly c3QgbGV2ZWzCoMKgIDAxMTExIMKgwqDCoCBTZWNvbmQgbGV2ZWwKCiDCoCBJRlNSIGZvcm1hdCB3 aGVuIHVzaW5nIHRoZSBMb25nLWRlc2NyaXB0b3IgdHJhbnNsYXRpb24gdGFibGUgZm9ybWF0Cgog wqDCoCAwMDExTEwgUGVybWlzc2lvbiBmYXVsdC4gTEwgYml0cyBpbmRpY2F0ZSBsZXZlbGIuCgpB ZnRlciBjaGVjayB0aGUgQVJNIHNwZWMsIEkgdGhpbmsgZm9yIHRoZSBwZXJtaXNzaW9uIGZhdWx0 LMKgIHdlIHNob3VsZCBwYW5pYwoKd2l0aCBvciB3aXRob3V0IExQQUUsIHdpbGwgY2hhbmdlIHRv CgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbW0vZmF1bHQuYyBiL2FyY2gvYXJtL21tL2ZhdWx0LmMK aW5kZXggN2NmYTlhNTlkM2VjLi5kZDk3ZDliMTlkZWMgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL21t L2ZhdWx0LmMKKysrIGIvYXJjaC9hcm0vbW0vZmF1bHQuYwpAQCAtMjU3LDggKzI1NywxMSBAQCBk b19wYWdlX2ZhdWx0KHVuc2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgaW50IGZzciwgCnN0cnVj dCBwdF9yZWdzICpyZWdzKQogwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHZtX2ZsYWdz ID0gVk1fV1JJVEU7CiDCoMKgwqDCoMKgwqDCoCB9CgotwqDCoMKgwqDCoMKgIGlmIChmc3IgJiBG U1JfTE5YX1BGKQorwqDCoMKgwqDCoMKgIGlmIChmc3IgJiBGU1JfTE5YX1BGKSB7CiDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgdm1fZmxhZ3MgPSBWTV9FWEVDOworwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCBpZiAoIXVzZXJfbW9kZShyZWdzKSkKK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGRpZV9rZXJuZWxfZmF1bHQoImV4ZWN1dGlvbiBv ZiBtZW1vcnkiLCBhZGRyLCAKZnNyLCByZWdzKTsKK8KgwqDCoMKgwqDCoCB9CgogwqDCoMKgwqDC oMKgwqAgcGVyZl9zd19ldmVudChQRVJGX0NPVU5UX1NXX1BBR0VfRkFVTFRTLCAxLCByZWdzLCBh ZGRyKTsKCklmIG5vIG9iamVjdCwgSSB3aWxsIHNlbmQgYWxsIHBhdGNoZXMgd2l0aCB1cGRhdGVz IHRvwqAgcGF0Y2ggc3lzdGVtLMKgIAp0aGFua3MuCgo+CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdAps aW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVh ZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==