Commit c71e0efe authored by Jan Kara's avatar Jan Kara Committed by Luis Henriques

rbd: Fix error recovery in rbd_obj_read_sync()

commit a8d42056 upstream.

When we fail to allocate page vector in rbd_obj_read_sync() we just
basically ignore the problem and continue which will result in an oops
later. Fix the problem by returning proper error.

CC: Yehuda Sadeh <yehuda@inktank.com>
CC: Sage Weil <sage@inktank.com>
CC: ceph-devel@vger.kernel.org
Coverity-id: 1226882
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarIlya Dryomov <idryomov@redhat.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 71d7c1ce
...@@ -3389,7 +3389,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev, ...@@ -3389,7 +3389,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,
page_count = (u32) calc_pages_for(offset, length); page_count = (u32) calc_pages_for(offset, length);
pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); pages = ceph_alloc_page_vector(page_count, GFP_KERNEL);
if (IS_ERR(pages)) if (IS_ERR(pages))
ret = PTR_ERR(pages); return PTR_ERR(pages);
ret = -ENOMEM; ret = -ENOMEM;
obj_request = rbd_obj_request_create(object_name, offset, length, obj_request = rbd_obj_request_create(object_name, offset, length,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment