aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/iovec.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/iovec.c')
-rw-r--r--net/core/iovec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/iovec.c b/net/core/iovec.c
index e6b133b77ccb..72aceb1fe4fa 100644
--- a/net/core/iovec.c
+++ b/net/core/iovec.c
@@ -42,7 +42,9 @@ long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
42 42
43 if (m->msg_namelen) { 43 if (m->msg_namelen) {
44 if (mode == VERIFY_READ) { 44 if (mode == VERIFY_READ) {
45 err = move_addr_to_kernel(m->msg_name, m->msg_namelen, 45 void __user *namep;
46 namep = (void __user __force *) m->msg_name;
47 err = move_addr_to_kernel(namep, m->msg_namelen,
46 address); 48 address);
47 if (err < 0) 49 if (err < 0)
48 return err; 50 return err;
@@ -53,7 +55,7 @@ long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
53 } 55 }
54 56
55 size = m->msg_iovlen * sizeof(struct iovec); 57 size = m->msg_iovlen * sizeof(struct iovec);
56 if (copy_from_user(iov, m->msg_iov, size)) 58 if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
57 return -EFAULT; 59 return -EFAULT;
58 60
59 m->msg_iov = iov; 61 m->msg_iov = iov;