Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ade30240 authored by Jubin John's avatar Jubin John Committed by Doug Ledford
Browse files

IB/rdmavt: Check lkey_table_size value before use 



The lkey_table_size driver specific parameter value is used before its
value is sanity checked and restricted to RVT_MAX_LKEY_TABLE_BITS.

This causes a vmalloc allocation failure for large values. Fix this
by moving the value check before the first usage of the value.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 582e05c3

drivers/infiniband/sw/rdmavt/mr.c

+1 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ int rvt_driver_mr_init(struct rvt_dev_info *rdi) 


	spin_lock_init(&rdi->lkey_table.lock);



	rdi->lkey_table.max = 1 << lkey_table_size;



	/* ensure generation is at least 4 bits */

	if (lkey_table_size > RVT_MAX_LKEY_TABLE_BITS) {

		rvt_pr_warn(rdi, "lkey bits %u too large, reduced to %u\n",
@@ -85,6 +83,7 @@ int rvt_driver_mr_init(struct rvt_dev_info *rdi) 
		rdi->dparms.lkey_table_size = RVT_MAX_LKEY_TABLE_BITS;

		lkey_table_size = rdi->dparms.lkey_table_size;

	}

	rdi->lkey_table.max = 1 << lkey_table_size;

	lk_tab_size = rdi->lkey_table.max * sizeof(*rdi->lkey_table.table);

	rdi->lkey_table.table = (struct rvt_mregion __rcu **)

			       vmalloc_node(lk_tab_size, rdi->dparms.node);