8192ab42bf
Untangle UML headers somewhat and add some includes where they were needed explicitly, but gotten accidentally via some other header. arch/um/include/um_uaccess.h loses asm/fixmap.h because it uses no fixmap stuff and gains elf.h, because it needs FIXADDR_USER_*, and archsetjmp.h, because it needs jmp_buf. pmd_alloc_one is uninlined because it needs mm_struct, and that's inconvenient to provide in asm-um/pgtable-3level.h. elf_core_copy_fpregs is also uninlined from elf-i386.h and elf-x86_64.h, which duplicated the code anyway, to arch/um/kernel/process.c, so that the reference to current_thread doesn't pull sched.h or anything related into asm/elf.h. arch/um/sys-i386/ldt.c, arch/um/kernel/tlb.c and arch/um/kernel/skas/uaccess.c got sched.h because they dereference task_structs. Its includes of linux and asm headers got turned from "" to <>. arch/um/sys-i386/bug.c gets asm/errno.h because it needs errno constants. asm/elf-i386 gets asm/user.h because it needs user_regs_struct. asm/fixmap.h gets page.h because it needs PAGE_SIZE and PAGE_MASK and system.h for BUG_ON. asm/pgtable doesn't need sched.h. asm/processor-generic.h defined mm_segment_t, but didn't use it. So, that definition is moved to uaccess.h, which defines a bunch of mm_segment_t-related stuff. thread_info.h uses mm_segment_t, and includes uaccess.h, which causes a recursion. So, the definition is placed above the include of thread_info. in uaccess.h. thread_info.h also gets page.h because it needs PAGE_SIZE. ObCheckpatchViolationJustification - I'm not adding a typedef; I'm moving mm_segment_t from one place to another. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
98 lines
3.1 KiB
C
98 lines
3.1 KiB
C
/*
|
|
* Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#ifndef __ARCH_UM_UACCESS_H
|
|
#define __ARCH_UM_UACCESS_H
|
|
|
|
#include <asm/elf.h>
|
|
#include <asm/fixmap.h>
|
|
#include "sysdep/archsetjmp.h"
|
|
|
|
#define __under_task_size(addr, size) \
|
|
(((unsigned long) (addr) < TASK_SIZE) && \
|
|
(((unsigned long) (addr) + (size)) < TASK_SIZE))
|
|
|
|
#define __access_ok_vsyscall(type, addr, size) \
|
|
((type == VERIFY_READ) && \
|
|
((unsigned long) (addr) >= FIXADDR_USER_START) && \
|
|
((unsigned long) (addr) + (size) <= FIXADDR_USER_END) && \
|
|
((unsigned long) (addr) + (size) >= (unsigned long)(addr)))
|
|
|
|
#define __addr_range_nowrap(addr, size) \
|
|
((unsigned long) (addr) <= ((unsigned long) (addr) + (size)))
|
|
|
|
#define access_ok(type, addr, size) \
|
|
(__addr_range_nowrap(addr, size) && \
|
|
(__under_task_size(addr, size) || \
|
|
__access_ok_vsyscall(type, addr, size) || \
|
|
segment_eq(get_fs(), KERNEL_DS)))
|
|
|
|
extern int copy_from_user(void *to, const void __user *from, int n);
|
|
extern int copy_to_user(void __user *to, const void *from, int n);
|
|
|
|
extern int __do_copy_to_user(void *to, const void *from, int n,
|
|
void **fault_addr, jmp_buf **fault_catcher);
|
|
extern void __do_copy(void *to, const void *from, int n);
|
|
|
|
/*
|
|
* strncpy_from_user: - Copy a NUL terminated string from userspace.
|
|
* @dst: Destination address, in kernel space. This buffer must be at
|
|
* least @count bytes long.
|
|
* @src: Source address, in user space.
|
|
* @count: Maximum number of bytes to copy, including the trailing NUL.
|
|
*
|
|
* Copies a NUL-terminated string from userspace to kernel space.
|
|
*
|
|
* On success, returns the length of the string (not including the trailing
|
|
* NUL).
|
|
*
|
|
* If access to userspace fails, returns -EFAULT (some data may have been
|
|
* copied).
|
|
*
|
|
* If @count is smaller than the length of the string, copies @count bytes
|
|
* and returns @count.
|
|
*/
|
|
|
|
extern int strncpy_from_user(char *dst, const char __user *src, int count);
|
|
|
|
/*
|
|
* __clear_user: - Zero a block of memory in user space, with less checking.
|
|
* @to: Destination address, in user space.
|
|
* @n: Number of bytes to zero.
|
|
*
|
|
* Zero a block of memory in user space. Caller must check
|
|
* the specified block with access_ok() before calling this function.
|
|
*
|
|
* Returns number of bytes that could not be cleared.
|
|
* On success, this will be zero.
|
|
*/
|
|
extern int __clear_user(void __user *mem, int len);
|
|
|
|
/*
|
|
* clear_user: - Zero a block of memory in user space.
|
|
* @to: Destination address, in user space.
|
|
* @n: Number of bytes to zero.
|
|
*
|
|
* Zero a block of memory in user space.
|
|
*
|
|
* Returns number of bytes that could not be cleared.
|
|
* On success, this will be zero.
|
|
*/
|
|
extern int clear_user(void __user *mem, int len);
|
|
|
|
/*
|
|
* strlen_user: - Get the size of a string in user space.
|
|
* @str: The string to measure.
|
|
* @n: The maximum valid length
|
|
*
|
|
* Get the size of a NUL-terminated string in user space.
|
|
*
|
|
* Returns the size of the string INCLUDING the terminating NUL.
|
|
* On exception, returns 0.
|
|
* If the string is too long, returns a value greater than @n.
|
|
*/
|
|
extern int strnlen_user(const void __user *str, int len);
|
|
|
|
#endif
|