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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
um
/
kernel
/
skas
/
uaccess.c
diff --git
a/arch/um/kernel/skas/uaccess.c
b/arch/um/kernel/skas/uaccess.c
index
7519528
..
5992c32
100644
(file)
--- a/
arch/um/kernel/skas/uaccess.c
+++ b/
arch/um/kernel/skas/uaccess.c
@@
-13,7
+13,7
@@
#include "asm/pgtable.h"
#include "asm/uaccess.h"
#include "kern_util.h"
#include "asm/pgtable.h"
#include "asm/uaccess.h"
#include "kern_util.h"
-#include "
user_util
.h"
+#include "
os
.h"
extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
pte_t *pte_out);
extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
pte_t *pte_out);
@@
-143,7
+143,7
@@
int copy_from_user_skas(void *to, const void __user *from, int n)
return(0);
}
return(0);
}
- return(access_ok
_skas
(VERIFY_READ, from, n) ?
+ return(access_ok(VERIFY_READ, from, n) ?
buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
n);
}
buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
n);
}
@@
-164,7
+164,7
@@
int copy_to_user_skas(void __user *to, const void *from, int n)
return(0);
}
return(0);
}
- return(access_ok
_skas
(VERIFY_WRITE, to, n) ?
+ return(access_ok(VERIFY_WRITE, to, n) ?
buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
n);
}
buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
n);
}
@@
-193,7
+193,7
@@
int strncpy_from_user_skas(char *dst, const char __user *src, int count)
return(strnlen(dst, count));
}
return(strnlen(dst, count));
}
- if(!access_ok
_skas
(VERIFY_READ, src, 1))
+ if(!access_ok(VERIFY_READ, src, 1))
return(-EFAULT);
n = buffer_op((unsigned long) src, count, 0, strncpy_chunk_from_user,
return(-EFAULT);
n = buffer_op((unsigned long) src, count, 0, strncpy_chunk_from_user,
@@
-221,7
+221,7
@@
int clear_user_skas(void __user *mem, int len)
return(0);
}
return(0);
}
- return(access_ok
_skas
(VERIFY_WRITE, mem, len) ?
+ return(access_ok(VERIFY_WRITE, mem, len) ?
buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len);
}
buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len);
}