IB/hfi1: Stricter bounds checking of MAD trap index

The macro size is valid. This change makes it less ambiguous.
Bounds check trap type for better security.

Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Kamenee Arumugam <kamenee.arumugam@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 37b19bfae02af12fee6e4167cdbeba4f750b0e9d..661ba707fc60f1283087ab24f282dc7010e9e56f 100644 (file)
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -151,13 +151,24 @@ static struct trap_node *check_and_add_trap(struct hfi1_ibport *ibp,
        unsigned long flags;
        unsigned long timeout;
        int found = 0;
+       unsigned int queue_id;
+       static int trap_count;
+
+       queue_id = trap->data.generic_type & 0x0F;
+       if (queue_id >= RVT_MAX_TRAP_LISTS) {
+               trap_count++;
+               pr_err_ratelimited("hfi1: Invalid trap 0x%0x dropped. Total dropped: %d\n",
+                                 trap->data.generic_type, trap_count);
+               kfree(trap);
+               return NULL;
+       }
 
        /*
         * Since the retry (handle timeout) does not remove a trap request
         * from the list, all we have to do is compare the node.
         */
        spin_lock_irqsave(&ibp->rvp.lock, flags);
-       trap_list = &ibp->rvp.trap_lists[trap->data.generic_type & 0x0F];
+       trap_list = &ibp->rvp.trap_lists[queue_id];
 
        list_for_each_entry(node, &trap_list->list, list) {
                if (node == trap) {

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 1d94f3c264ba257af8b5cceb05b4cddc6b7b1f3d..1ba84a78f1c5435f4e049313acdf581820667ecc 100644 (file)
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -64,7 +64,7 @@
 #define RVT_MAX_PKEY_VALUES 16
 
 #define RVT_MAX_TRAP_LEN 100 /* Limit pending trap list */
-#define RVT_MAX_TRAP_LISTS ((IB_NOTICE_TYPE_INFO & 0x0F) + 1)
+#define RVT_MAX_TRAP_LISTS 5 /*((IB_NOTICE_TYPE_INFO & 0x0F) + 1)*/
 #define RVT_TRAP_TIMEOUT 4096 /* 4.096 usec */
 
 struct trap_list {