3 files changed, 5 insertions, 1 deletions

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 4d27e4c3fe34..7d801e6252f1 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1399,6 +1399,9 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
         if (copy_from_user(&cmd, buf, sizeof cmd))
                 return -EFAULT;
 
+        if (cmd.qp_type == IB_QPT_RAW_PACKET && !capable(CAP_NET_RAW))
+                return -EPERM;
+
         INIT_UDATA(&udata, buf + sizeof cmd,
                    (unsigned long) cmd.response + sizeof resp,
                    in_len - sizeof cmd, out_len - sizeof resp);
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 575b78045aaf..140f9a5d492f 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -479,6 +479,7 @@ static const struct {
                                 [IB_QPT_UD]  = (IB_QP_PKEY_INDEX                |
                                                 IB_QP_PORT                      |
                                                 IB_QP_QKEY),
+                                [IB_QPT_RAW_PACKET] = IB_QP_PORT,
                                 [IB_QPT_UC]  = (IB_QP_PKEY_INDEX                |
                                                 IB_QP_PORT                      |
                                                 IB_QP_ACCESS_FLAGS),
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index c3cca5a4dacd..a3fa3232b8a0 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -605,7 +605,7 @@ enum ib_qp_type {
         IB_QPT_UD,
         IB_QPT_RAW_IPV6,
         IB_QPT_RAW_ETHERTYPE,
-        /* Save 8 for RAW_PACKET */
+        IB_QPT_RAW_PACKET = 8,
         IB_QPT_XRC_INI = 9,
         IB_QPT_XRC_TGT,
         IB_QPT_MAX