Rev 1708 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1708 | Rev 1780 | ||
---|---|---|---|
Line 65... | Line 65... | ||
65 | 65 | ||
66 | ASSERT(THREAD); |
66 | ASSERT(THREAD); |
67 | ASSERT(!THREAD->in_copy_from_uspace); |
67 | ASSERT(!THREAD->in_copy_from_uspace); |
68 | 68 | ||
69 | if (!KERNEL_ADDRESS_SPACE_SHADOWED) { |
69 | if (!KERNEL_ADDRESS_SPACE_SHADOWED) { |
70 | if (overlaps((__address) uspace_src, size, |
70 | if (overlaps((uintptr_t) uspace_src, size, |
71 | KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) { |
71 | KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) { |
72 | /* |
72 | /* |
73 | * The userspace source block conflicts with kernel address space. |
73 | * The userspace source block conflicts with kernel address space. |
74 | */ |
74 | */ |
75 | return EPERM; |
75 | return EPERM; |
Line 106... | Line 106... | ||
106 | 106 | ||
107 | ASSERT(THREAD); |
107 | ASSERT(THREAD); |
108 | ASSERT(!THREAD->in_copy_from_uspace); |
108 | ASSERT(!THREAD->in_copy_from_uspace); |
109 | 109 | ||
110 | if (!KERNEL_ADDRESS_SPACE_SHADOWED) { |
110 | if (!KERNEL_ADDRESS_SPACE_SHADOWED) { |
111 | if (overlaps((__address) uspace_dst, size, |
111 | if (overlaps((uintptr_t) uspace_dst, size, |
112 | KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) { |
112 | KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) { |
113 | /* |
113 | /* |
114 | * The userspace destination block conflicts with kernel address space. |
114 | * The userspace destination block conflicts with kernel address space. |
115 | */ |
115 | */ |
116 | return EPERM; |
116 | return EPERM; |