diff options
| author | Xiubo Li <xiubli@redhat.com> | 2023-05-18 09:47:23 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-24 17:36:55 +0100 |
| commit | 317ee8c54faa0e6152d1af2826b05f407db458a2 (patch) | |
| tree | 6d5da68340a82f144097348679ab1a2883cb8978 | |
| parent | e3d1adcad5b73c7ed0c7edb35ab68abcaa45cf67 (diff) | |
ceph: force updating the msg pointer in non-split case
commit 4cafd0400bcb6187c0d4ab4d4b0229a89ac4f8c2 upstream.
When the MClientSnap reqeust's op is not CEPH_SNAP_OP_SPLIT the
request may still contain a list of 'split_realms', and we need
to skip it anyway. Or it will be parsed as a corrupt snaptrace.
Cc: stable@vger.kernel.org
Link: https://tracker.ceph.com/issues/61200
Reported-by: Frank Schilder <frans@dtu.dk>
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/ceph/snap.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index b512c82f9ccd..f7dd1dfd07f2 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -1028,6 +1028,19 @@ skip_inode: continue; adjust_snap_realm_parent(mdsc, child, realm->ino); } + } else { + /* + * In the non-split case both 'num_split_inos' and + * 'num_split_realms' should be 0, making this a no-op. + * However the MDS happens to populate 'split_realms' list + * in one of the UPDATE op cases by mistake. + * + * Skip both lists just in case to ensure that 'p' is + * positioned at the start of realm info, as expected by + * ceph_update_snap_trace(). + */ + p += sizeof(u64) * num_split_inos; + p += sizeof(u64) * num_split_realms; } /* |