Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f302921 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS fix from Ralf Baechle:
 "Only a single fix for 4.7 pending at this point.  It fixes an issue
  that may lead to corruption of the cache mode bits in the page table"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix possible corruption of cache mode by mprotect.
parents 70bd68d7 6d037de9

arch/mips/include/asm/pgtable.h

+6 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct mm_struct; 
struct vm_area_struct;



#define PAGE_NONE	__pgprot(_PAGE_PRESENT | _PAGE_NO_READ | \

				 _CACHE_CACHABLE_NONCOHERENT)

				 _page_cachable_default)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_WRITE | \

				 _page_cachable_default)

#define PAGE_COPY	__pgprot(_PAGE_PRESENT | _PAGE_NO_EXEC | \
@@ -476,7 +476,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	pte.pte_low  &= (_PAGE_MODIFIED | _PAGE_ACCESSED | _PFNX_MASK);

	pte.pte_high &= (_PFN_MASK | _CACHE_MASK);

	pte.pte_low  |= pgprot_val(newprot) & ~_PFNX_MASK;

	pte.pte_high |= pgprot_val(newprot) & ~_PFN_MASK;

	pte.pte_high |= pgprot_val(newprot) & ~(_PFN_MASK | _CACHE_MASK);

	return pte;

}

#elif defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
@@ -491,7 +491,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
#else

static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{

	return __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot));

	return __pte((pte_val(pte) & _PAGE_CHG_MASK) |

		     (pgprot_val(newprot) & ~_PAGE_CHG_MASK));

}

#endif
@@ -632,7 +633,8 @@ static inline struct page *pmd_page(pmd_t pmd) 


static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)

{

	pmd_val(pmd) = (pmd_val(pmd) & _PAGE_CHG_MASK) | pgprot_val(newprot);

	pmd_val(pmd) = (pmd_val(pmd) & _PAGE_CHG_MASK) |

		       (pgprot_val(newprot) & ~_PAGE_CHG_MASK);

	return pmd;

}