iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libceph: move schedule_delayed_work() in ceph_osdc_init()

Browse Source 
ceph_osdc_stop() isn't called if ceph_osdc_init() fails, so we end up
with handle_osds_timeout() running on invalid memory if any one of the
allocations fails.  Call schedule_delayed_work() after everything is
setup, just before returning.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov
2016-04-28 16:07:24 +02:00
parent fe5da05e97
commit b37ee1b9b8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ceph/osd_client.c
View File

@ -2729,9 +2729,6 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client)
osdc->event_tree = RB_ROOT; osdc->event_tree = RB_ROOT;
osdc->event_count = 0; osdc->event_count = 0;
schedule_delayed_work(&osdc->osds_timeout_work,
round_jiffies_relative(osdc->client->options->osd_idle_ttl));
err = -ENOMEM; err = -ENOMEM;
osdc->req_mempool = mempool_create_slab_pool(10, osdc->req_mempool = mempool_create_slab_pool(10,
ceph_osd_request_cache); ceph_osd_request_cache);
@ -2752,6 +2749,9 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client)
if (!osdc->notify_wq) if (!osdc->notify_wq)
goto out_msgpool_reply; goto out_msgpool_reply;
schedule_delayed_work(&osdc->osds_timeout_work,
round_jiffies_relative(osdc->client->options->osd_idle_ttl));
return 0; return 0;
out_msgpool_reply: out_msgpool_reply: