X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fcore%2Fnetfilter.c;h=dd8b9a8eefa8ad090342e349ae3f1903e024703b;hb=333b49614bac1801f614128fdcdb6346b383a0df;hp=3aabe124d0bb4d7288e3898ecf9d00dc94c8e510;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git diff --git a/net/core/netfilter.c b/net/core/netfilter.c index 3aabe124d..dd8b9a8ee 100644 --- 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, - char *opt, int *len, int get) + char __user *opt, int *len, int get) { 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; } -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 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); }