summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGuy Shapiro <guysh@mellanox.com>2015-10-22 12:20:11 (GMT)
committerDoug Ledford <dledford@redhat.com>2015-10-28 16:32:48 (GMT)
commit95893dde99d9d14f8a6ac99ea3103792a8da5f25 (patch)
treee2553696f8abf64abb7ccfb4583e58a784dc78da /drivers
parentfa20105e09e97e81aadf02f722c31195e4a75c84 (diff)
downloadlinux-95893dde99d9d14f8a6ac99ea3103792a8da5f25.tar.xz
IB/ucma: Take the network namespace from the process
Add support for network namespaces from user space. This is done by passing the network namespace of the process instead of init_net. Signed-off-by: Haggai Eran <haggaie@mellanox.com> Signed-off-by: Yotam Kenneth <yotamke@mellanox.com> Signed-off-by: Shachar Raindel <raindel@mellanox.com> Signed-off-by: Guy Shapiro <guysh@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/infiniband/core/ucma.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index e80c107..8b5a934 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -42,6 +42,7 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#include <linux/module.h>
+#include <linux/nsproxy.h>
#include <rdma/rdma_user_cm.h>
#include <rdma/ib_marshall.h>
@@ -472,8 +473,8 @@ static ssize_t ucma_create_id(struct ucma_file *file, const char __user *inbuf,
return -ENOMEM;
ctx->uid = cmd.uid;
- ctx->cm_id = rdma_create_id(&init_net, ucma_event_handler, ctx, cmd.ps,
- qp_type);
+ ctx->cm_id = rdma_create_id(current->nsproxy->net_ns,
+ ucma_event_handler, ctx, cmd.ps, qp_type);
if (IS_ERR(ctx->cm_id)) {
ret = PTR_ERR(ctx->cm_id);
goto err1;