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
/
llc
/
af_llc.c
diff --git
a/net/llc/af_llc.c
b/net/llc/af_llc.c
index
cd5e993
..
d088fe8
100644
(file)
--- a/
net/llc/af_llc.c
+++ b/
net/llc/af_llc.c
@@
-867,7
+867,7
@@
out:
static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,
unsigned long arg)
{
static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,
unsigned long arg)
{
- return dev_ioctl(cmd, (void *)arg);
+ return dev_ioctl(cmd, (void
__user
*)arg);
}
/**
}
/**
@@
-881,7
+881,7
@@
static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,
* Set various connection specific parameters.
*/
static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
* Set various connection specific parameters.
*/
static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
- char *optval, int optlen)
+ char
__user
*optval, int optlen)
{
struct sock *sk = sock->sk;
struct llc_opt *llc = llc_sk(sk);
{
struct sock *sk = sock->sk;
struct llc_opt *llc = llc_sk(sk);
@@
-890,7
+890,7
@@
static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
lock_sock(sk);
if (level != SOL_LLC || optlen != sizeof(int))
goto out;
lock_sock(sk);
if (level != SOL_LLC || optlen != sizeof(int))
goto out;
- rc = get_user(opt, (int *)optval);
+ rc = get_user(opt, (int
__user
*)optval);
if (rc)
goto out;
rc = -EINVAL;
if (rc)
goto out;
rc = -EINVAL;
@@
-956,7
+956,7
@@
out:
* Get connection specific socket information.
*/
static int llc_ui_getsockopt(struct socket *sock, int level, int optname,
* Get connection specific socket information.
*/
static int llc_ui_getsockopt(struct socket *sock, int level, int optname,
- char
*optval, int
*optlen)
+ char
__user *optval, int __user
*optlen)
{
struct sock *sk = sock->sk;
struct llc_opt *llc = llc_sk(sk);
{
struct sock *sk = sock->sk;
struct llc_opt *llc = llc_sk(sk);