p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IB/hfi1: Make n_krcvqs be an unsigned long integer 

The global variable n_krcvqs stores the sum of the number of kernel
receive queues of VLs 0-7 which the user can pass to the driver through
the module parameter array krcvqs which is of type unsigned integer. If
the user passes large value(s) into krcvqs parameter array, it can cause
an arithmetic overflow while calculating n_krcvqs which is also of type
unsigned int. The overflow results in an incorrect value of n_krcvqs
which can lead to kernel crash while loading the driver.

Fix by changing the data type of n_krcvqs to unsigned long. This patch
also changes the data type of other variables that get their values from
n_krcvqs.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Harish Chegondi <harish.chegondi@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Harish Chegondi 2016-08-31 07:24:40 -07:00 committed by Doug Ledford
parent 673b975f1f
commit 429b6a7217
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/hw/hfi1/chip.c
View File

@ -12935,7 +12935,7 @@ static int set_up_interrupts(struct hfi1_devdata *dd)
*/ */
static int set_up_context_variables(struct hfi1_devdata *dd) static int set_up_context_variables(struct hfi1_devdata *dd)
{ {
int num_kernel_contexts; unsigned long num_kernel_contexts;
int total_contexts; int total_contexts;
int ret; int ret;
unsigned ngroups; unsigned ngroups;
@ -12964,9 +12964,9 @@ static int set_up_context_variables(struct hfi1_devdata *dd)
*/ */
if (num_kernel_contexts > (dd->chip_send_contexts - num_vls - 1)) { if (num_kernel_contexts > (dd->chip_send_contexts - num_vls - 1)) {
dd_dev_err(dd, dd_dev_err(dd,
"Reducing # kernel rcv contexts to: %d, from %d\n", "Reducing # kernel rcv contexts to: %d, from %lu\n",
(int)(dd->chip_send_contexts - num_vls - 1), (int)(dd->chip_send_contexts - num_vls - 1),
(int)num_kernel_contexts); num_kernel_contexts);
num_kernel_contexts = dd->chip_send_contexts - num_vls - 1; num_kernel_contexts = dd->chip_send_contexts - num_vls - 1;
} }
/* /*

2
drivers/infiniband/hw/hfi1/hfi.h
View File

@ -1806,7 +1806,7 @@ extern unsigned int hfi1_max_mtu;
extern unsigned int hfi1_cu; extern unsigned int hfi1_cu;
extern unsigned int user_credit_return_threshold; extern unsigned int user_credit_return_threshold;
extern int num_user_contexts; extern int num_user_contexts;
extern unsigned n_krcvqs; extern unsigned long n_krcvqs;
extern uint krcvqs[]; extern uint krcvqs[];
extern int krcvqsset; extern int krcvqsset;
extern uint kdeth_qp; extern uint kdeth_qp;

2
drivers/infiniband/hw/hfi1/init.c
View File

@ -94,7 +94,7 @@ module_param_array(krcvqs, uint, &krcvqsset, S_IRUGO);
MODULE_PARM_DESC(krcvqs, "Array of the number of non-control kernel receive queues by VL"); MODULE_PARM_DESC(krcvqs, "Array of the number of non-control kernel receive queues by VL");
/* computed based on above array */ /* computed based on above array */
unsigned n_krcvqs; unsigned long n_krcvqs;
static unsigned hfi1_rcvarr_split = 25; static unsigned hfi1_rcvarr_split = 25;
module_param_named(rcvarr_split, hfi1_rcvarr_split, uint, S_IRUGO); module_param_named(rcvarr_split, hfi1_rcvarr_split, uint, S_IRUGO);