git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
alpha
/
lib
/
csum_partial_copy.c
diff --git
a/arch/alpha/lib/csum_partial_copy.c
b/arch/alpha/lib/csum_partial_copy.c
index
3e0da49
..
4af1022
100644
(file)
--- a/
arch/alpha/lib/csum_partial_copy.c
+++ b/
arch/alpha/lib/csum_partial_copy.c
@@
-193,7
+193,8
@@
csum_partial_cfu_dest_aligned(const unsigned long __user *src,
* This is slightly less fun than the above..
*/
static inline unsigned long
* This is slightly less fun than the above..
*/
static inline unsigned long
-csum_partial_cfu_src_aligned(const unsigned long *src, unsigned long *dst,
+csum_partial_cfu_src_aligned(const unsigned long __user *src,
+ unsigned long *dst,
unsigned long doff,
long len, unsigned long checksum,
unsigned long partial_dest,
unsigned long doff,
long len, unsigned long checksum,
unsigned long partial_dest,
@@
-372,7
+373,7
@@
unsigned int
csum_partial_copy_from_user(const char __user *src, char *dst, int len,
unsigned int sum, int *errp)
{
csum_partial_copy_from_user(const char __user *src, char *dst, int len,
unsigned int sum, int *errp)
{
- if (!access_ok(
src, len, VERIFY_READ
)) {
+ if (!access_ok(
VERIFY_READ, src, len
)) {
*errp = -EFAULT;
memset(dst, 0, len);
return sum;
*errp = -EFAULT;
memset(dst, 0, len);
return sum;