summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-05-20 21:15:40 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-05-20 21:15:40 +0300
commitb851c1f8e02a16e86ad8f2c18aa50fd017a8ad3b (patch)
treebda4feac74d455eb237b390e41eebf26ac25873e /include
parent265f34c25bad0d92ca439838529db366adb0e620 (diff)
parentd0bb883c6355bcb2cc149fb4d5c3b28ccd327a5e (diff)
downloadlinux-b851c1f8e02a16e86ad8f2c18aa50fd017a8ad3b.tar.xz
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.h3
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;
};