diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-20 08:15:40 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-20 08:15:40 -1000 |
| commit | b851c1f8e02a16e86ad8f2c18aa50fd017a8ad3b (patch) | |
| tree | bda4feac74d455eb237b390e41eebf26ac25873e /include | |
| parent | Merge tag 'riscv-for-linus-5.18-rc8' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | libceph: fix misleading ceph_osdc_cancel_request() comment (diff) | |
| download | linux-b851c1f8e02a16e86ad8f2c18aa50fd017a8ad3b.tar.gz linux-b851c1f8e02a16e86ad8f2c18aa50fd017a8ad3b.zip | |
Merge tag 'ceph-for-5.18-rc8' of https://github.com/ceph/ceph-client
Pull ceph fix from Ilya Dryomov:
"A fix for a nasty use-after-free, marked for stable"
* tag 'ceph-for-5.18-rc8' of https://github.com/ceph/ceph-client:
libceph: fix misleading ceph_osdc_cancel_request() comment
libceph: fix potential use-after-free on linger ping and resends
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ceph/osd_client.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 3431011f364d..cba8a6ffc329 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -287,6 +287,9 @@ struct ceph_osd_linger_request { rados_watcherrcb_t errcb; void *data; + struct ceph_pagelist *request_pl; + struct page **notify_id_pages; + struct page ***preply_pages; size_t *preply_len; }; |