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
/
core
/
netfilter.c
diff --git
a/net/core/netfilter.c
b/net/core/netfilter.c
index
3aabe12
..
dd8b9a8
100644
(file)
--- a/
net/core/netfilter.c
+++ b/
net/core/netfilter.c
@@
-286,7
+286,7
@@
void nf_debug_ip_finish_output2(struct sk_buff *skb)
/* Call get/setsockopt() */
static int nf_sockopt(struct sock *sk, int pf, int val,
/* Call get/setsockopt() */
static int nf_sockopt(struct sock *sk, int pf, int val,
- char *opt, int *len, int get)
+ char
__user
*opt, int *len, int get)
{
struct list_head *i;
struct nf_sockopt_ops *ops;
{
struct list_head *i;
struct nf_sockopt_ops *ops;
@@
-329,13
+329,13
@@
static int nf_sockopt(struct sock *sk, int pf, int val,
return ret;
}
return ret;
}
-int nf_setsockopt(struct sock *sk, int pf, int val, char *opt,
+int nf_setsockopt(struct sock *sk, int pf, int val, char
__user
*opt,
int len)
{
return nf_sockopt(sk, pf, val, opt, &len, 0);
}
int len)
{
return nf_sockopt(sk, pf, val, opt, &len, 0);
}
-int nf_getsockopt(struct sock *sk, int pf, int val, char *opt, int *len)
+int nf_getsockopt(struct sock *sk, int pf, int val, char
__user
*opt, int *len)
{
return nf_sockopt(sk, pf, val, opt, len, 1);
}
{
return nf_sockopt(sk, pf, val, opt, len, 1);
}