Commit 5d0381e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
  sh: Force __access_ok() to obey address space limit.
  sh: Fix argument page dcache flushing regression.
parents 22fb53c9 d7587b14

include/asm-sh/cacheflush.h

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ extern void __flush_purge_region(void *start, int size); 
extern void __flush_invalidate_region(void *start, int size);

#endif



#define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE

static inline void flush_kernel_dcache_page(struct page *page)

{

	flush_dcache_page(page);

}



#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_CACHE_OFF)

extern void copy_to_user_page(struct vm_area_struct *vma,

	struct page *page, unsigned long vaddr, void *dst, const void *src,

include/asm-sh/uaccess.h

+15 −27
Original line number Diff line number Diff line
@@ -73,38 +73,26 @@ static inline int __access_ok(unsigned long addr, unsigned long size) 
/*

 * __access_ok: Check if address with size is OK or not.

 *

 * We do three checks:

 * (1) is it user space?

 * (2) addr + size --> carry?

 * (3) addr + size >= 0x80000000  (PAGE_OFFSET)

 * Uhhuh, this needs 33-bit arithmetic. We have a carry..

 *

 * (1) (2) (3) | RESULT

 *  0   0   0  |  ok

 *  0   0   1  |  ok

 *  0   1   0  |  bad

 *  0   1   1  |  bad

 *  1   0   0  |  ok

 *  1   0   1  |  bad

 *  1   1   0  |  bad

 *  1   1   1  |  bad

 * sum := addr + size;  carry? --> flag = true;

 * if (sum >= addr_limit) flag = true;

 */

static inline int __access_ok(unsigned long addr, unsigned long size)

{

	unsigned long flag, tmp;



	__asm__("stc	r7_bank, %0\n\t"

		"mov.l	@(8,%0), %0\n\t"

		"clrt\n\t"

		"addc	%2, %1\n\t"

		"and	%1, %0\n\t"

		"rotcl	%0\n\t"

		"rotcl	%0\n\t"

		"and	#3, %0"

		: "=&z" (flag), "=r" (tmp)

		: "r" (addr), "1" (size)

	unsigned long flag, sum;



	__asm__("clrt\n\t"

		"addc	%3, %1\n\t"

		"movt	%0\n\t"

		"cmp/hi	%4, %1\n\t"

		"rotcl	%0"

		:"=&r" (flag), "=r" (sum)

		:"1" (addr), "r" (size),

		 "r" (current_thread_info()->addr_limit.seg)

		:"t");



	return flag == 0;



}

#endif /* CONFIG_MMU */