Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ceph: fix memory leaks in __ceph_sync_read()

Browse Source 
In two `break` statements, the call to ceph_release_page_vector() was
missing, leaking the allocation from ceph_alloc_page_vector().

Instead of adding the missing ceph_release_page_vector() calls, the
Ceph maintainers preferred to transfer page ownership to the
`ceph_osd_request` by passing `own_pages=true` to
osd_req_op_extent_osd_data_pages().  This requires postponing the
ceph_osdc_put_request() call until after the block that accesses the
`pages`.

Cc: stable@vger.kernel.org
Fixes: 03bc06c7b0 ("ceph: add new mount option to enable sparse reads")
Fixes: f0fe1e54cf ("ceph: plumb in decryption during reads")
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Max Kellermann 2024-12-05 16:49:51 +01:00 committed by Ilya Dryomov
parent 78d4f34e21
commit d6fd6f8280
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ceph/file.c
View File

@ -1127,7 +1127,7 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,
osd_req_op_extent_osd_data_pages(req, 0, pages, read_len, osd_req_op_extent_osd_data_pages(req, 0, pages, read_len,
offset_in_page(read_off), offset_in_page(read_off),
false, false); false, true);
op = &req->r_ops[0]; op = &req->r_ops[0];
if (sparse) { if (sparse) {
@ -1186,8 +1186,6 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,
ret = min_t(ssize_t, fret, len); ret = min_t(ssize_t, fret, len);
} }
ceph_osdc_put_request(req);
/* Short read but not EOF? Zero out the remainder. */ /* Short read but not EOF? Zero out the remainder. */
if (ret >= 0 && ret < len && (off + ret < i_size)) { if (ret >= 0 && ret < len && (off + ret < i_size)) {
int zlen = min(len - ret, i_size - off - ret); int zlen = min(len - ret, i_size - off - ret);
@ -1221,7 +1219,8 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,
break; break;
} }
} }
ceph_release_page_vector(pages, num_pages);
ceph_osdc_put_request(req);
if (ret < 0) { if (ret < 0) {
if (ret == -EBLOCKLISTED) if (ret == -EBLOCKLISTED)