1 files changed, 12 insertions, 7 deletions

diff --git a/net/socket.c b/net/socket.c
index 01f3f8f32d6f..fae408abea54 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -635,7 +635,7 @@ EXPORT_SYMBOL(sock_sendmsg);
 int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
                    struct kvec *vec, size_t num, size_t size)
 {
-        iov_iter_kvec(&msg->msg_iter, WRITE | ITER_KVEC, vec, num, size);
+        iov_iter_kvec(&msg->msg_iter, WRITE, vec, num, size);
         return sock_sendmsg(sock, msg);
 }
 EXPORT_SYMBOL(kernel_sendmsg);
@@ -648,7 +648,7 @@ int kernel_sendmsg_locked(struct sock *sk, struct msghdr *msg,
         if (!sock->ops->sendmsg_locked)
                 return sock_no_sendmsg_locked(sk, msg, size);
 
-        iov_iter_kvec(&msg->msg_iter, WRITE | ITER_KVEC, vec, num, size);
+        iov_iter_kvec(&msg->msg_iter, WRITE, vec, num, size);
 
         return sock->ops->sendmsg_locked(sk, msg, msg_data_left(msg));
 }
@@ -823,7 +823,7 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
         mm_segment_t oldfs = get_fs();
         int result;
 
-        iov_iter_kvec(&msg->msg_iter, READ | ITER_KVEC, vec, num, size);
+        iov_iter_kvec(&msg->msg_iter, READ, vec, num, size);
         set_fs(KERNEL_DS);
         result = sock_recvmsg(sock, msg, flags);
         set_fs(oldfs);
@@ -1475,7 +1475,7 @@ int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen)
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (sock) {
                 err = move_addr_to_kernel(umyaddr, addrlen, &address);
-                if (err >= 0) {
+                if (!err) {
                         err = security_socket_bind(sock,
                                                    (struct sockaddr *)&address,
                                                    addrlen);
@@ -2875,9 +2875,14 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
                     copy_in_user(&rxnfc->fs.ring_cookie,
                                  &compat_rxnfc->fs.ring_cookie,
                                  (void __user *)(&rxnfc->fs.location + 1) -
-                                 (void __user *)&rxnfc->fs.ring_cookie) ||
-                    copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
-                                 sizeof(rxnfc->rule_cnt)))
+                                 (void __user *)&rxnfc->fs.ring_cookie))
+                        return -EFAULT;
+                if (ethcmd == ETHTOOL_GRXCLSRLALL) {
+                        if (put_user(rule_cnt, &rxnfc->rule_cnt))
+                                return -EFAULT;
+                } else if (copy_in_user(&rxnfc->rule_cnt,
+                                        &compat_rxnfc->rule_cnt,
+                                        sizeof(rxnfc->rule_cnt)))
                         return -EFAULT;
         }