Skip to content

Commit

Permalink
ceph: don't reference req after put
Browse files Browse the repository at this point in the history
In __unregister_request(), there is a call to list_del_init()
referencing a request that was the subject of a call to
ceph_osdc_put_request() on the previous line.  This is not
safe, because the request structure could have been freed
by the time we reach the list_del_init().

Fix this by reversing the order of these lines.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-off-by: Sage Weil <sage@inktank.com>
  • Loading branch information
Alex Elder committed Dec 17, 2012
1 parent 42382b7 commit 7d5f248
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/ceph/osd_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -871,9 +871,9 @@ static void __unregister_request(struct ceph_osd_client *osdc,
req->r_osd = NULL;
}

list_del_init(&req->r_req_lru_item);
ceph_osdc_put_request(req);

list_del_init(&req->r_req_lru_item);
if (osdc->num_requests == 0) {
dout(" no requests, canceling timeout\n");
__cancel_osd_timeout(osdc);
Expand Down

0 comments on commit 7d5f248

Please sign in to comment.