mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
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: [email protected] Link: https://tracker.ceph.com/issues/61200 Reported-by: Frank Schilder <[email protected]> Signed-off-by: Xiubo Li <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
6eb9ed0ab7
commit
a33c172c1e
1 changed files with 13 additions and 0 deletions
|
|
@ -1005,6 +1005,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;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue