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

Commit 253fb390 authored by Robert Walsh's avatar Robert Walsh Committed by Roland Dreier
Browse files

IB/ipath: Check reserved memory keys 



Don't let userspace use the direct-physical-map L_key or R_key.

Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent f0810daf

drivers/infiniband/hw/ipath/ipath_keys.c

+12 −0
Original line number Diff line number Diff line
@@ -133,6 +133,12 @@ int ipath_lkey_ok(struct ipath_qp *qp, struct ipath_sge *isge, 
	 * being reversible by calling bus_to_virt().

	 */

	if (sge->lkey == 0) {

		struct ipath_pd *pd = to_ipd(qp->ibqp.pd);



		if (pd->user) {

			ret = 0;

			goto bail;

		}

		isge->mr = NULL;

		isge->vaddr = (void *) sge->addr;

		isge->length = sge->length;
@@ -206,6 +212,12 @@ int ipath_rkey_ok(struct ipath_qp *qp, struct ipath_sge_state *ss, 
	 * (see ipath_get_dma_mr and ipath_dma.c).

	 */

	if (rkey == 0) {

		struct ipath_pd *pd = to_ipd(qp->ibqp.pd);



		if (pd->user) {

			ret = 0;

			goto bail;

		}

		sge->mr = NULL;

		sge->vaddr = (void *) vaddr;

		sge->length = len;