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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
net
/
ipv6
/
udp.c
diff --git
a/net/ipv6/udp.c
b/net/ipv6/udp.c
index
17cf6dd
..
63ef593
100644
(file)
--- a/
net/ipv6/udp.c
+++ b/
net/ipv6/udp.c
@@
-1026,7
+1026,7
@@
static int udpv6_destroy_sock(struct sock *sk)
* Socket option code for UDP
*/
static int udpv6_setsockopt(struct sock *sk, int level, int optname,
* Socket option code for UDP
*/
static int udpv6_setsockopt(struct sock *sk, int level, int optname,
- char *optval, int optlen)
+ char
__user
*optval, int optlen)
{
struct udp_opt *up = udp_sk(sk);
int val;
{
struct udp_opt *up = udp_sk(sk);
int val;
@@
-1038,7
+1038,7
@@
static int udpv6_setsockopt(struct sock *sk, int level, int optname,
if(optlen<sizeof(int))
return -EINVAL;
if(optlen<sizeof(int))
return -EINVAL;
- if (get_user(val, (int *)optval))
+ if (get_user(val, (int
__user
*)optval))
return -EFAULT;
switch(optname) {
return -EFAULT;
switch(optname) {
@@
-1066,7
+1066,7
@@
static int udpv6_setsockopt(struct sock *sk, int level, int optname,
}
static int udpv6_getsockopt(struct sock *sk, int level, int optname,
}
static int udpv6_getsockopt(struct sock *sk, int level, int optname,
- char
*optval, int
*optlen)
+ char
__user *optval, int __user
*optlen)
{
struct udp_opt *up = udp_sk(sk);
int val, len;
{
struct udp_opt *up = udp_sk(sk);
int val, len;