On Fri, Jul 28, 2023 at 12:39:11AM -0700, Harshvardhan Jha wrote: > The following series is a backport the fix of CVE-2023-1611 > on stable 5.4. All pics were clean and no conflict resolution was > needed. > > Commits "btrfs: qgroup: remove one-time use variables for quota_root > checks" and "btrfs: qgroup: return ENOTCONN instead of EINVAL when > quotas are not enabled" were added to get a clean pick for the fix > "btrfs: fix race between quota disable and quota assign ioctls" > > These changes have been tested using the xfstests test-suite and no regressions > were observed when compared to stable 5.4. > > Filipe Manana (1): > btrfs: fix race between quota disable and quota assign ioctls > > Marcos Paulo de Souza (2): > btrfs: qgroup: remove one-time use variables for quota_root checks > btrfs: qgroup: return ENOTCONN instead of EINVAL when quotas are not > enabled > > fs/btrfs/ioctl.c | 2 ++ > fs/btrfs/qgroup.c | 55 +++++++++++++++++++++-------------------------- > 2 files changed, 27 insertions(+), 30 deletions(-) > > -- > 2.40.0 > All now queued up, thanks. greg k-h
