diff options
author | Namhyung Kim <namhyung@gmail.com> | 2010-09-07 23:48:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-09 18:02:38 -0400 |
commit | a700d8be733bd593ea4797dfde17aed4f35213c0 (patch) | |
tree | 03686d890db4825472a3ae10ff49394994723d3f | |
parent | cf0ac2b8a759fecbefd80f890c6dbe80ba65fd95 (diff) |
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 1cd98df412df..f4657c2127b4 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, | |||
41 | 41 | ||
42 | if (m->msg_namelen) { | 42 | if (m->msg_namelen) { |
43 | if (mode == VERIFY_READ) { | 43 | if (mode == VERIFY_READ) { |
44 | err = move_addr_to_kernel(m->msg_name, m->msg_namelen, | 44 | void __user *namep; |
45 | namep = (void __user __force *) m->msg_name; | ||
46 | err = move_addr_to_kernel(namep, m->msg_namelen, | ||
45 | address); | 47 | address); |
46 | if (err < 0) | 48 | if (err < 0) |
47 | return err; | 49 | return err; |
@@ -52,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, | |||
52 | } | 54 | } |
53 | 55 | ||
54 | size = m->msg_iovlen * sizeof(struct iovec); | 56 | size = m->msg_iovlen * sizeof(struct iovec); |
55 | if (copy_from_user(iov, m->msg_iov, size)) | 57 | if (copy_from_user(iov, (void __user __force *) m->msg_iov, size)) |
56 | return -EFAULT; | 58 | return -EFAULT; |
57 | 59 | ||
58 | m->msg_iov = iov; | 60 | m->msg_iov = iov; |