diff options
| author | Robert Walsh <robert.walsh@qlogic.com> | 2007-03-15 14:45:14 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-04-18 20:21:00 -0700 |
| commit | 253fb3902008353831525ab711909abdd5ee191f (patch) | |
| tree | b34e5201de20cb4b7fa9db350f587ecac15c9033 | |
| parent | f0810daf74c564a3615eba5002cc11c21a0949ba (diff) | |
| download | op-kernel-dev-253fb3902008353831525ab711909abdd5ee191f.zip op-kernel-dev-253fb3902008353831525ab711909abdd5ee191f.tar.gz | |
IB/ipath: Check reserved memory keys
Don't let userspace use the direct-physical-map L_key or R_key.
Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_keys.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c index c93fa2f..dd487c1 100644 --- a/drivers/infiniband/hw/ipath/ipath_keys.c +++ b/drivers/infiniband/hw/ipath/ipath_keys.c @@ -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; |
