Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4c3c4b4513a361cc6ac5ee8677695260c4f0f25f
Commit:     4c3c4b4513a361cc6ac5ee8677695260c4f0f25f
Parent:     e66a95127dc4273d3573eb03657991f7bbd5dca3
Author:     Andi Kleen <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:33:42 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:33:42 2008 +0100

    x86: clean up pte_exec
    
    - Rename it to pte_exec() from pte_exec_kernel(). There is nothing
    kernel specific in there.
    - Move it into the common file because _PAGE_NX is 0 on !PAE and then
    pte_exec() will be always evaluate to true.
    
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Harvey Harrison <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 arch/x86/mm/fault_32.c           |    2 +-
 arch/x86/mm/init_32.c            |    2 +-
 include/asm-x86/pgtable-2level.h |    8 --------
 include/asm-x86/pgtable-3level.h |    8 --------
 include/asm-x86/pgtable.h        |    1 +
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index 41c3196..f7972ae 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -615,7 +615,7 @@ no_context:
                if (error_code & PF_INSTR) {
                        pte_t *pte = lookup_address(address);
 
-                       if (pte && pte_present(*pte) && !pte_exec_kernel(*pte))
+                       if (pte && pte_present(*pte) && !pte_exec(*pte))
                                printk(KERN_CRIT "kernel tried to execute "
                                        "NX-protected page - exploit attempt? "
                                        "(uid: %d)\n", current->uid);
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 724a5ef..5080646 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -542,7 +542,7 @@ int __init set_kernel_exec(unsigned long vaddr, int enable)
        pte = lookup_address(vaddr);
        BUG_ON(!pte);
 
-       if (!pte_exec_kernel(*pte))
+       if (!pte_exec(*pte))
                ret = 0;
 
        if (enable)
diff --git a/include/asm-x86/pgtable-2level.h b/include/asm-x86/pgtable-2level.h
index ce486bd..701404f 100644
--- a/include/asm-x86/pgtable-2level.h
+++ b/include/asm-x86/pgtable-2level.h
@@ -56,14 +56,6 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp)
 #define pte_pfn(x)             (pte_val(x) >> PAGE_SHIFT)
 
 /*
- * All present pages are kernel-executable:
- */
-static inline int pte_exec_kernel(pte_t pte)
-{
-       return 1;
-}
-
-/*
  * Bits 0, 6 and 7 are taken, split up the 29 bits of offset
  * into this range:
  */
diff --git a/include/asm-x86/pgtable-3level.h b/include/asm-x86/pgtable-3level.h
index 62bb065..62a1ffb 100644
--- a/include/asm-x86/pgtable-3level.h
+++ b/include/asm-x86/pgtable-3level.h
@@ -19,14 +19,6 @@
 #define pud_bad(pud)                           0
 #define pud_present(pud)                       1
 
-/*
- * All present pages with !NX bit are kernel-executable:
- */
-static inline int pte_exec_kernel(pte_t pte)
-{
-       return !(pte_val(pte) & _PAGE_NX);
-}
-
 /* Rules for using set_pte: the pte being assigned *must* be
  * either not present or in a state where the hardware will
  * not attempt to update the pte.  In places where this is
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h
index 75a656e..2f3d908 100644
--- a/include/asm-x86/pgtable.h
+++ b/include/asm-x86/pgtable.h
@@ -139,6 +139,7 @@ static inline int pte_young(pte_t pte)              { 
return pte_val(pte) & _PAGE_ACCESSED;
 static inline int pte_write(pte_t pte)         { return pte_val(pte) & 
_PAGE_RW; }
 static inline int pte_file(pte_t pte)          { return pte_val(pte) & 
_PAGE_FILE; }
 static inline int pte_huge(pte_t pte)          { return pte_val(pte) & 
_PAGE_PSE; }
+static inline int pte_exec(pte_t pte)          { return !(pte_val(pte) & 
_PAGE_NX); }
 
 static inline int pmd_large(pmd_t pte) {
        return (pmd_val(pte) & (_PAGE_PSE|_PAGE_PRESENT)) ==
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to