renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00
Code

IB/hfi1: Stricter bounds checking of MAD trap index

Browse Source 
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>
This commit is contained in:
Kamenee Arumugame 2017-08-13 08:08:46 -07:00 committed by Doug Ledford
parent 76ae6222a4
commit ec0d8b8a63
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/infiniband/hw/hfi1/mad.c
View File

@ -151,13 +151,24 @@ static struct trap_node *check_and_add_trap(struct hfi1_ibport *ibp,
unsigned long flags; unsigned long flags;
unsigned long timeout; unsigned long timeout;
int found = 0; 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 * Since the retry (handle timeout) does not remove a trap request
* from the list, all we have to do is compare the node. * from the list, all we have to do is compare the node.
*/ */
spin_lock_irqsave(&ibp->rvp.lock, flags); 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) { list_for_each_entry(node, &trap_list->list, list) {
if (node == trap) { if (node == trap) {

2
include/rdma/rdma_vt.h
View File

@ -64,7 +64,7 @@
#define RVT_MAX_PKEY_VALUES 16 #define RVT_MAX_PKEY_VALUES 16
#define RVT_MAX_TRAP_LEN 100 /* Limit pending trap list */ #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 */ #define RVT_TRAP_TIMEOUT 4096 /* 4.096 usec */
struct trap_list { struct trap_list {