diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2010-09-08 03:48:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 15:02:38 -0700 |
| commit | a700d8be733bd593ea4797dfde17aed4f35213c0 (patch) | |
| tree | 03686d890db4825472a3ae10ff49394994723d3f | |
| parent | cf0ac2b8a759fecbefd80f890c6dbe80ba65fd95 (diff) | |
| download | linux-3.10-a700d8be733bd593ea4797dfde17aed4f35213c0.tar.gz linux-3.10-a700d8be733bd593ea4797dfde17aed4f35213c0.tar.bz2 linux-3.10-a700d8be733bd593ea4797dfde17aed4f35213c0.zip | |
net/core: remove address space warnings on verify_iovec()
move_addr_to_kernel() and copy_from_user() requires their argument
as __user pointer but were missing proper markups. Add it.
This removes following warnings from sparse.
net/core/iovec.c:44:52: warning: incorrect type in argument 1 (different address spaces)
net/core/iovec.c:44:52: expected void [noderef] <asn:1>*uaddr
net/core/iovec.c:44:52: got void *msg_name
net/core/iovec.c:55:34: warning: incorrect type in argument 2 (different address spaces)
net/core/iovec.c:55:34: expected void const [noderef] <asn:1>*from
net/core/iovec.c:55:34: got struct iovec *msg_iov
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/iovec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/iovec.c b/net/core/iovec.c index 1cd98df412d..f4657c2127b 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -41,7 +41,9 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, if (m->msg_namelen) { if (mode == VERIFY_READ) { - err = move_addr_to_kernel(m->msg_name, m->msg_namelen, + void __user *namep; + namep = (void __user __force *) m->msg_name; + err = move_addr_to_kernel(namep, m->msg_namelen, address); if (err < 0) return err; @@ -52,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, } size = m->msg_iovlen * sizeof(struct iovec); - if (copy_from_user(iov, m->msg_iov, size)) + if (copy_from_user(iov, (void __user __force *) m->msg_iov, size)) return -EFAULT; m->msg_iov = iov; |