mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
New code for 5.15:
- Strengthen parameter checking for project quota ids. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEUzaAxoMeQq6m2jMV+H93GTRKtOsFAmEMLBQACgkQ+H93GTRK tOv/hxAAg2wYliHBrgVO7TbVzmhpM+0BLbhHzbaG4gO6NlDlDGbH1yorA+TgLSB9 TEk0X6CLh3wYVa5J5/RKiU8mtWFU5Dowj/LHhsnhlnyluEY7nDkskfHX0dspQ+gz bI/RDDpH6rprwe8d7oNZAQsbC1+Ulbmet3oGhvKldLxMLJ7wvuVTkBnr+SjMl18P jSTHLTKqW9vFd60l9dSdn0jIgIRNFVWCBJDRcs+YU7NpELivRFoY2UaipS1UfMbn FtP3tUIoaP6rrhLFTOY3emZOYh6ingCxiIggpZYPxtkXGlFivZa+EOVQRvqVjUHK OVFI8fXr0D6G6mSyPlnDFzfVCnGa9z1bY3uJqP0M0YRsxoEDU8djKgY6kMRXvUsy tK9cFIQPijlXX9j+qXCiYOwS7CTM1+/6ep7NkcHT8ZFn4SAZOFCRT2QU42DtfY3c aYAgu5W++3XJnbMVi71HtaD4PNLv6VjsSm3NZqd5E3b0QFZjYu84UbYt/+RZ9nF6 n7cytwkLocPLCk4llEfOnETswaO0fGHtecQRAsvjBQZHTRjTthpiXuO3YofY5QwK dAXXT5Kesfqer1WLT1FwOjn6v5P4+J4dw7U5K7xpj6CMnk9jQ+vmvo6ULUGZikpO jXVnnNI661Ytu/SshbgpXnVX09/9dQY8eYN7SCbEebW3+AAujYE= =rUwN -----END PGP SIGNATURE----- Merge tag 'vfs-5.15-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux Pull project quota update from Darrick Wong: "A single VFS patch that prevents userspace from setting project quota ids on files that the VFS considers invalid" * tag 'vfs-5.15-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: fs: forbid invalid project ID
This commit is contained in:
commit
916d636e0a
|
@ -614,6 +614,14 @@ static int fileattr_set_prepare(struct inode *inode,
|
||||||
if ((old_ma->fsx_xflags ^ fa->fsx_xflags) &
|
if ((old_ma->fsx_xflags ^ fa->fsx_xflags) &
|
||||||
FS_XFLAG_PROJINHERIT)
|
FS_XFLAG_PROJINHERIT)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
} else {
|
||||||
|
/*
|
||||||
|
* Caller is allowed to change the project ID. If it is being
|
||||||
|
* changed, make sure that the new value is valid.
|
||||||
|
*/
|
||||||
|
if (old_ma->fsx_projid != fa->fsx_projid &&
|
||||||
|
!projid_valid(make_kprojid(&init_user_ns, fa->fsx_projid)))
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check extent size hints. */
|
/* Check extent size hints. */
|
||||||
|
|
Loading…
Reference in a new issue