Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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.
+6
include/asm-sh/cacheflush.h
+6
include/asm-sh/cacheflush.h
···
43
43
extern void __flush_invalidate_region(void *start, int size);
44
44
#endif
45
45
46
+
#define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE
47
+
static inline void flush_kernel_dcache_page(struct page *page)
48
+
{
49
+
flush_dcache_page(page);
50
+
}
51
+
46
52
#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_CACHE_OFF)
47
53
extern void copy_to_user_page(struct vm_area_struct *vma,
48
54
struct page *page, unsigned long vaddr, void *dst, const void *src,
+14
-26
include/asm-sh/uaccess.h
+14
-26
include/asm-sh/uaccess.h
···
73
73
/*
74
74
* __access_ok: Check if address with size is OK or not.
75
75
*
76
-
* We do three checks:
77
-
* (1) is it user space?
78
-
* (2) addr + size --> carry?
79
-
* (3) addr + size >= 0x80000000 (PAGE_OFFSET)
76
+
* Uhhuh, this needs 33-bit arithmetic. We have a carry..
80
77
*
81
-
* (1) (2) (3) | RESULT
82
-
* 0 0 0 | ok
83
-
* 0 0 1 | ok
84
-
* 0 1 0 | bad
85
-
* 0 1 1 | bad
86
-
* 1 0 0 | ok
87
-
* 1 0 1 | bad
88
-
* 1 1 0 | bad
89
-
* 1 1 1 | bad
78
+
* sum := addr + size; carry? --> flag = true;
79
+
* if (sum >= addr_limit) flag = true;
90
80
*/
91
81
static inline int __access_ok(unsigned long addr, unsigned long size)
92
82
{
93
-
unsigned long flag, tmp;
83
+
unsigned long flag, sum;
94
84
95
-
__asm__("stc r7_bank, %0\n\t"
96
-
"mov.l @(8,%0), %0\n\t"
97
-
"clrt\n\t"
98
-
"addc %2, %1\n\t"
99
-
"and %1, %0\n\t"
100
-
"rotcl %0\n\t"
101
-
"rotcl %0\n\t"
102
-
"and #3, %0"
103
-
: "=&z" (flag), "=r" (tmp)
104
-
: "r" (addr), "1" (size)
105
-
: "t");
106
-
85
+
__asm__("clrt\n\t"
86
+
"addc %3, %1\n\t"
87
+
"movt %0\n\t"
88
+
"cmp/hi %4, %1\n\t"
89
+
"rotcl %0"
90
+
:"=&r" (flag), "=r" (sum)
91
+
:"1" (addr), "r" (size),
92
+
"r" (current_thread_info()->addr_limit.seg)
93
+
:"t");
107
94
return flag == 0;
95
+
108
96
}
109
97
#endif /* CONFIG_MMU */
110
98