Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a700d8be authored by Namhyung Kim's avatar Namhyung Kim Committed by David S. Miller
Browse files

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: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf0ac2b8

net/core/iovec.c

+4 −2
Original line number Diff line number Diff line
@@ -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;