diff options
Diffstat (limited to '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; |
