Skip to content

Commit

Permalink
IB/uverbs: Fix unlocking in error paths
Browse files Browse the repository at this point in the history
ib_uverbs_create_ah() and ib_uverbs_create_srq() did not release the
PD's read lock in their error paths, which lead to deadlock when
destroying the PD.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
  • Loading branch information
Michael S. Tsirkin authored and Roland Dreier committed Jul 23, 2006
1 parent abb5a5c commit ec924b4
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/infiniband/core/uverbs_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
ah = ib_create_ah(pd, &attr);
if (IS_ERR(ah)) {
ret = PTR_ERR(ah);
goto err;
goto err_put;
}

ah->uobject = uobj;
Expand Down Expand Up @@ -1811,6 +1811,9 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
err_destroy:
ib_destroy_ah(ah);

err_put:
put_pd_read(pd);

err:
put_uobj_write(uobj);
return ret;
Expand Down Expand Up @@ -1984,7 +1987,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,
srq = pd->device->create_srq(pd, &attr, &udata);
if (IS_ERR(srq)) {
ret = PTR_ERR(srq);
goto err;
goto err_put;
}

srq->device = pd->device;
Expand Down Expand Up @@ -2029,6 +2032,9 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,
err_destroy:
ib_destroy_srq(srq);

err_put:
put_pd_read(pd);

err:
put_uobj_write(&obj->uobject);
return ret;
Expand Down

0 comments on commit ec924b4

Please sign in to comment.