diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-14 17:07:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-14 17:07:51 -0700 |
| commit | 9c03f1622af051004416dd3e24d8a0fa31e34178 (patch) | |
| tree | e7dad951e3b2eeb691cb7d5970e3c728176972c3 /include | |
| parent | a4128b03ff1ff5bc6ea922518a3f36a09b914379 (diff) | |
| parent | eefdca043e8391dcd719711716492063030b55ac (diff) | |
| download | linux-3.10-9c03f1622af051004416dd3e24d8a0fa31e34178.tar.gz linux-3.10-9c03f1622af051004416dd3e24d8a0fa31e34178.tar.bz2 linux-3.10-9c03f1622af051004416dd3e24d8a0fa31e34178.zip | |
Merge ssh://master.kernel.org/home/hpa/tree/sec
* ssh://master.kernel.org/home/hpa/tree/sec:
x86-64, compat: Retruncate rax after ia32 syscall entry tracing
x86-64, compat: Test %rax for the syscall number, not %eax
compat: Make compat_alloc_user_space() incorporate the access_ok()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compat.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index 9ddc8780e8d..5778b559d59 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -360,5 +360,8 @@ extern ssize_t compat_rw_copy_check_uvector(int type, const struct compat_iovec __user *uvector, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer, struct iovec **ret_pointer); + +extern void __user *compat_alloc_user_space(unsigned long len); + #endif /* CONFIG_COMPAT */ #endif /* _LINUX_COMPAT_H */ |