diff options
| author | Alex Elder <elder@inktank.com> | 2012-11-29 08:37:03 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:46:48 -0800 |
| commit | 4de98b629ee84b800da6f4a5f8b0f4cfba3a7e3c (patch) | |
| tree | 25273812791302515bdcfd9c66f032c9ade398f1 | |
| parent | 46ed4fbffa67c423be6233a01e2fdf220ca8f5f0 (diff) | |
ceph: don't reference req after put
(cherry picked from commit 7d5f24812bd182a2471cb69c1c2baf0648332e1f)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/ceph/osd_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index fc4e60e73552..183baf40383a 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -873,9 +873,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); |