The fix of CVE-2024-37354 1ff2bd566fbc doesn't apply cleanly to 5.15 as it requires an extra prequisite patch `8a2b3da191e5a btrfs: add helper to truncate inode items when logging inode` for the context to be the same. Therefore two patches were brought back as part of this backport.
The prerequisite patch is part of a 10 patch patch series however bringing all of them back felt more of a feature backport rather than CVE fix. Please let me know if bringing the entire series back is more preferrable then I shall re-send v2.
Some basic smoke testing and btrfs testing on inhouse test suite was done and no regressions were observerd.
Filipe Manana (1): btrfs: add helper to truncate inode items when logging inode
Omar Sandoval (1): btrfs: fix crash on racing fsync and size-extending write into prealloc
fs/btrfs/tree-log.c | 47 ++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 18 deletions(-)