From patchwork Fri Mar 19 20:58:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rabin Vincent X-Patchwork-Id: 48192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E1F52B7D2E for ; Sat, 20 Mar 2010 08:06:09 +1100 (EST) Received: from localhost ([127.0.0.1]:35900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsjOP-0001Y8-Pc for incoming@patchwork.ozlabs.org; Fri, 19 Mar 2010 17:06:05 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NsjGr-0000MQ-6N for qemu-devel@nongnu.org; Fri, 19 Mar 2010 16:58:17 -0400 Received: from [199.232.76.173] (port=52196 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsjGp-0000JL-Af for qemu-devel@nongnu.org; Fri, 19 Mar 2010 16:58:15 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NsjGo-0003ov-5Y for qemu-devel@nongnu.org; Fri, 19 Mar 2010 16:58:15 -0400 Received: from mail-fx0-f214.google.com ([209.85.220.214]:64707) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NsjGn-0003oX-Rh for qemu-devel@nongnu.org; Fri, 19 Mar 2010 16:58:14 -0400 Received: by fxm6 with SMTP id 6so22681fxm.2 for ; Fri, 19 Mar 2010 13:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=HYqmTfTIjjEXjzgywgMDB41G2HUjAQoM5u0Xxe7JD2s=; b=GxN273dY1Aa3hztfs9zvvi3PmW7Em4sI8JvaMHBYUGeU4c+RIfcSy7OpVLqlyN/HBO eFVmY4kQsdoul/tiPJdsnRxXOfwvZmN9ScIDncZCK+QyNFluL+tq/fLMU5hxLtRmWTUx oUsGEX2aLhbq71zWPe61BN8qJ/ppkh1F5iYz8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=xnzNCo3foe7MKjiMWgfrMV2uorW9sy92O7uC57PMwAOKX1FZtNnJMiO6jGTKskUWJP 0LTgULAhwymwb2JAtgiQGbFES4RElRJlQcSsj8S15cra2QyoJ+ESrDW/JNYuvwIuC3tW 84A75Z7GSlnBYgkwecb6wRaXkYO4tcP3/sAjs= Received: by 10.87.62.31 with SMTP id p31mr9540309fgk.21.1269032287098; Fri, 19 Mar 2010 13:58:07 -0700 (PDT) Received: from localhost.localdomain ([59.164.192.185]) by mx.google.com with ESMTPS id e17sm2771216fke.57.2010.03.19.13.58.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 19 Mar 2010 13:58:05 -0700 (PDT) From: Rabin Vincent To: qemu-devel@nongnu.org Date: Sat, 20 Mar 2010 02:28:03 +0530 Message-Id: <1269032283-2277-1-git-send-email-rabin@rab.in> X-Mailer: git-send-email 1.7.0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Rabin Vincent Subject: [Qemu-devel] [PATCH] target-arm: disable PAGE_EXEC for XN pages X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Don't set PAGE_EXEC for XN pages, to avoid a bypass of XN protection checking if the page is already in the TLB. Signed-off-by: Rabin Vincent --- target-arm/helper.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 18e22b1..e092b21 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -979,6 +979,7 @@ static int get_phys_addr_v5(CPUState *env, uint32_t address, int access_type, /* Access permission fault. */ goto do_fault; } + *prot |= PAGE_EXEC; *phys_ptr = phys_addr; return 0; do_fault: @@ -1075,6 +1076,9 @@ static int get_phys_addr_v6(CPUState *env, uint32_t address, int access_type, /* Access permission fault. */ goto do_fault; } + if (!xn) { + *prot |= PAGE_EXEC; + } *phys_ptr = phys_addr; return 0; do_fault: @@ -1137,6 +1141,7 @@ static int get_phys_addr_mpu(CPUState *env, uint32_t address, int access_type, /* Bad permission. */ return 1; } + *prot |= PAGE_EXEC; return 0; } @@ -1152,7 +1157,7 @@ static inline int get_phys_addr(CPUState *env, uint32_t address, if ((env->cp15.c1_sys & 1) == 0) { /* MMU/MPU disabled. */ *phys_ptr = address; - *prot = PAGE_READ | PAGE_WRITE; + *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; *page_size = TARGET_PAGE_SIZE; return 0; } else if (arm_feature(env, ARM_FEATURE_MPU)) { @@ -1183,8 +1188,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, /* Map a single [sub]page. */ phys_addr &= ~(uint32_t)0x3ff; address &= ~(uint32_t)0x3ff; - tlb_set_page (env, address, phys_addr, prot | PAGE_EXEC, mmu_idx, - page_size); + tlb_set_page (env, address, phys_addr, prot, mmu_idx, page_size); return 0; }