mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
RDMA/cma: Add check to validate that cm_id is bound to a device
Several checks in the rdma_cm check against the state of the cm_id, but only to validate that the cm_id is bound to an underlying transport specific CM and an RDMA device. Make the check explicit in what we're trying to check for, since we're not synchronizing against the cm_id state. This will allow a user to disconnect a cm_id or reject a connection after receiving a device removal event. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
be65f086f2
commit
6c719f5c6c
1 changed files with 8 additions and 4 deletions
|
@ -368,6 +368,11 @@ static void cma_enable_remove(struct rdma_id_private *id_priv)
|
||||||
wake_up(&id_priv->wait_remove);
|
wake_up(&id_priv->wait_remove);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int cma_has_cm_dev(struct rdma_id_private *id_priv)
|
||||||
|
{
|
||||||
|
return (id_priv->id.device && id_priv->cm_id.ib);
|
||||||
|
}
|
||||||
|
|
||||||
struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
|
struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
|
||||||
void *context, enum rdma_port_space ps)
|
void *context, enum rdma_port_space ps)
|
||||||
{
|
{
|
||||||
|
@ -2422,7 +2427,7 @@ int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
id_priv = container_of(id, struct rdma_id_private, id);
|
id_priv = container_of(id, struct rdma_id_private, id);
|
||||||
if (!cma_comp(id_priv, CMA_CONNECT))
|
if (!cma_has_cm_dev(id_priv))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
switch (id->device->node_type) {
|
switch (id->device->node_type) {
|
||||||
|
@ -2444,7 +2449,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data,
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
id_priv = container_of(id, struct rdma_id_private, id);
|
id_priv = container_of(id, struct rdma_id_private, id);
|
||||||
if (!cma_comp(id_priv, CMA_CONNECT))
|
if (!cma_has_cm_dev(id_priv))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
switch (rdma_node_get_transport(id->device->node_type)) {
|
switch (rdma_node_get_transport(id->device->node_type)) {
|
||||||
|
@ -2475,8 +2480,7 @@ int rdma_disconnect(struct rdma_cm_id *id)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
id_priv = container_of(id, struct rdma_id_private, id);
|
id_priv = container_of(id, struct rdma_id_private, id);
|
||||||
if (!cma_comp(id_priv, CMA_CONNECT) &&
|
if (!cma_has_cm_dev(id_priv))
|
||||||
!cma_comp(id_priv, CMA_DISCONNECT))
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
switch (rdma_node_get_transport(id->device->node_type)) {
|
switch (rdma_node_get_transport(id->device->node_type)) {
|
||||||
|
|
Loading…
Reference in a new issue