diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-08-16 19:46:48 -0300 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 16:01:39 -0700 |
| commit | 4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d (patch) | |
| tree | a11270e23933664056cfd3d53e3ae2a661515d23 /net/ipv4/ip_sockglue.c | |
| parent | 6ed8a48582c08432e84e5610564c1d25fe00dd7f (diff) | |
| download | linux-4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d.tar.gz linux-4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d.tar.bz2 linux-4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d.zip | |
[IP]: Introduce ip_options_get_from_user
This variant is needed to satisfy sparse __user annotations.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index aca088b3707a..2f0b47da5b37 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -153,7 +153,7 @@ int ip_cmsg_send(struct msghdr *msg, struct ipcm_cookie *ipc) switch (cmsg->cmsg_type) { case IP_RETOPTS: err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)); - err = ip_options_get(&ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40, 0); + err = ip_options_get(&ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40); if (err) return err; break; @@ -425,7 +425,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval, struct ip_options * opt = NULL; if (optlen > 40 || optlen < 0) goto e_inval; - err = ip_options_get(&opt, optval, optlen, 1); + err = ip_options_get_from_user(&opt, optval, optlen); if (err) break; if (sk->sk_type == SOCK_STREAM) { |