6 files changed, 48 insertions, 60 deletions

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 6d777069d86d..b930b8110a63 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -79,7 +79,6 @@ static DEFINE_IDR(sdp_ps);
 static DEFINE_IDR(tcp_ps);
 static DEFINE_IDR(udp_ps);
 static DEFINE_IDR(ipoib_ps);
-static int next_port;
 
 struct cma_device {
         struct list_head        list;
@@ -1677,13 +1676,13 @@ int rdma_set_ib_paths(struct rdma_cm_id *id,
         if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_RESOLVED))
                 return -EINVAL;
 
-        id->route.path_rec = kmalloc(sizeof *path_rec * num_paths, GFP_KERNEL);
+        id->route.path_rec = kmemdup(path_rec, sizeof *path_rec * num_paths,
+                                     GFP_KERNEL);
         if (!id->route.path_rec) {
                 ret = -ENOMEM;
                 goto err;
         }
 
-        memcpy(id->route.path_rec, path_rec, sizeof *path_rec * num_paths);
         id->route.num_paths = num_paths;
         return 0;
 err:
@@ -1970,47 +1969,33 @@ err1:
 
 static int cma_alloc_any_port(struct idr *ps, struct rdma_id_private *id_priv)
 {
-        struct rdma_bind_list *bind_list;
-        int port, ret, low, high;
-
-        bind_list = kzalloc(sizeof *bind_list, GFP_KERNEL);
-        if (!bind_list)
-                return -ENOMEM;
-
-retry:
-        /* FIXME: add proper port randomization per like inet_csk_get_port */
-        do {
-                ret = idr_get_new_above(ps, bind_list, next_port, &port);
-        } while ((ret == -EAGAIN) && idr_pre_get(ps, GFP_KERNEL));
-
-        if (ret)
-                goto err1;
+        static unsigned int last_used_port;
+        int low, high, remaining;
+        unsigned int rover;
 
         inet_get_local_port_range(&low, &high);
-        if (port > high) {
-                if (next_port != low) {
-                        idr_remove(ps, port);
-                        next_port = low;
-                        goto retry;
-                }
-                ret = -EADDRNOTAVAIL;
-                goto err2;
+        remaining = (high - low) + 1;
+        rover = net_random() % remaining + low;
+retry:
+        if (last_used_port != rover &&
+            !idr_find(ps, (unsigned short) rover)) {
+                int ret = cma_alloc_port(ps, id_priv, rover);
+                /*
+                 * Remember previously used port number in order to avoid
+                 * re-using same port immediately after it is closed.
+                 */
+                if (!ret)
+                        last_used_port = rover;
+                if (ret != -EADDRNOTAVAIL)
+                        return ret;
         }
-
-        if (port == high)
-                next_port = low;
-        else
-                next_port = port + 1;
-
-        bind_list->ps = ps;
-        bind_list->port = (unsigned short) port;
-        cma_bind_port(bind_list, id_priv);
-        return 0;
-err2:
-        idr_remove(ps, port);
-err1:
-        kfree(bind_list);
-        return ret;
+        if (--remaining) {
+                rover++;
+                if ((rover < low) || (rover > high))
+                        rover = low;
+                goto retry;
+        }
+        return -EADDRNOTAVAIL;
 }
 
 static int cma_use_port(struct idr *ps, struct rdma_id_private *id_priv)
@@ -2995,12 +2980,7 @@ static void cma_remove_one(struct ib_device *device)
 
 static int __init cma_init(void)
 {
-        int ret, low, high, remaining;
-
-        get_random_bytes(&next_port, sizeof next_port);
-        inet_get_local_port_range(&low, &high);
-        remaining = (high - low) + 1;
-        next_port = ((unsigned int) next_port % remaining) + low;
+        int ret;
 
         cma_wq = create_singlethread_workqueue("rdma_cm");
         if (!cma_wq)
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 1df1194aeba4..6dc7b77d5d29 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -291,13 +291,11 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
         }
 
         if (mad_reg_req) {
-                reg_req = kmalloc(sizeof *reg_req, GFP_KERNEL);
+                reg_req = kmemdup(mad_reg_req, sizeof *reg_req, GFP_KERNEL);
                 if (!reg_req) {
                         ret = ERR_PTR(-ENOMEM);
                         goto error3;
                 }
-                /* Make a copy of the MAD registration request */
-                memcpy(reg_req, mad_reg_req, sizeof *reg_req);
         }
 
         /* Now, fill in the various structures */
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 512b1c43460c..46474842cfe9 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -1181,7 +1181,7 @@ static int ib_ucm_open(struct inode *inode, struct file *filp)
         file->filp = filp;
         file->device = container_of(inode->i_cdev, struct ib_ucm_device, cdev);
 
-        return 0;
+        return nonseekable_open(inode, filp);
 }
 
 static int ib_ucm_close(struct inode *inode, struct file *filp)
@@ -1229,6 +1229,7 @@ static const struct file_operations ucm_fops = {
         .release = ib_ucm_close,
         .write   = ib_ucm_write,
         .poll    = ib_ucm_poll,
+        .llseek  = no_llseek,
 };
 
 static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr,
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 46185084121e..ac7edc24165c 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -1220,7 +1220,8 @@ static int ucma_open(struct inode *inode, struct file *filp)
 
         filp->private_data = file;
         file->filp = filp;
-        return 0;
+
+        return nonseekable_open(inode, filp);
 }
 
 static int ucma_close(struct inode *inode, struct file *filp)
@@ -1250,6 +1251,7 @@ static const struct file_operations ucma_fops = {
         .release = ucma_close,
         .write   = ucma_write,
         .poll    = ucma_poll,
+        .llseek  = no_llseek,
 };
 
 static struct miscdevice ucma_misc = {
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index e7db054fb1c8..6babb72b39fc 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -781,7 +781,7 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
 {
         struct ib_umad_port *port;
         struct ib_umad_file *file;
-        int ret = 0;
+        int ret;
 
         port = container_of(inode->i_cdev, struct ib_umad_port, cdev);
         if (port)
@@ -814,6 +814,8 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
 
         list_add_tail(&file->port_list, &port->file_list);
 
+        ret = nonseekable_open(inode, filp);
+
 out:
         mutex_unlock(&port->file_mutex);
         return ret;
@@ -866,7 +868,8 @@ static const struct file_operations umad_fops = {
         .compat_ioctl   = ib_umad_compat_ioctl,
 #endif
         .open           = ib_umad_open,
-        .release        = ib_umad_close
+        .release        = ib_umad_close,
+        .llseek         = no_llseek,
 };
 
 static int ib_umad_sm_open(struct inode *inode, struct file *filp)
@@ -903,7 +906,7 @@ static int ib_umad_sm_open(struct inode *inode, struct file *filp)
 
         filp->private_data = port;
 
-        return 0;
+        return nonseekable_open(inode, filp);
 
 fail:
         kref_put(&port->umad_dev->ref, ib_umad_release_dev);
@@ -933,7 +936,8 @@ static int ib_umad_sm_close(struct inode *inode, struct file *filp)
 static const struct file_operations umad_sm_fops = {
         .owner   = THIS_MODULE,
         .open    = ib_umad_sm_open,
-        .release = ib_umad_sm_close
+        .release = ib_umad_sm_close,
+        .llseek  = no_llseek,
 };
 
 static struct ib_client umad_client = {
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index fb3526254426..ec83e9fe387b 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -369,7 +369,8 @@ static const struct file_operations uverbs_event_fops = {
         .read    = ib_uverbs_event_read,
         .poll    = ib_uverbs_event_poll,
         .release = ib_uverbs_event_close,
-        .fasync  = ib_uverbs_event_fasync
+        .fasync  = ib_uverbs_event_fasync,
+        .llseek  = no_llseek,
 };
 
 void ib_uverbs_comp_handler(struct ib_cq *cq, void *cq_context)
@@ -623,7 +624,7 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
 
         filp->private_data = file;
 
-        return 0;
+        return nonseekable_open(inode, filp);
 
 err_module:
         module_put(dev->ib_dev->owner);
@@ -651,7 +652,8 @@ static const struct file_operations uverbs_fops = {
         .owner   = THIS_MODULE,
         .write   = ib_uverbs_write,
         .open    = ib_uverbs_open,
-        .release = ib_uverbs_close
+        .release = ib_uverbs_close,
+        .llseek  = no_llseek,
 };
 
 static const struct file_operations uverbs_mmap_fops = {
@@ -659,7 +661,8 @@ static const struct file_operations uverbs_mmap_fops = {
         .write   = ib_uverbs_write,
         .mmap    = ib_uverbs_mmap,
         .open    = ib_uverbs_open,
-        .release = ib_uverbs_close
+        .release = ib_uverbs_close,
+        .llseek  = no_llseek,
 };
 
 static struct ib_client uverbs_client = {