vfs/v6.4-rc2/misc.fixes
-----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRAhzRXHqcMeLMyaSiRxhvAZXjcogUCZG9CygAKCRCRxhvAZXjc opSUAP94up0d2bhB4CDRGkszpBefogBXyEylT8v+1EPtzs8K6QEA9OEbn4wWsIlh vYLUjejArgUGuxDl7iiZzAx8p6n9qws= =lEs3 -----END PGP SIGNATURE----- Merge tag 'vfs/v6.4-rc3/misc.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs Pull vfs fixes from Christian Brauner: - During the acl rework we merged this cycle the generic_listxattr() helper had to be modified in a way that in principle it would allow for POSIX ACLs to be reported. At least that was the impression we had initially. Because before the acl rework POSIX ACLs would be reported if the filesystem did have POSIX ACL xattr handlers in sb->s_xattr. That logic changed and now we can simply check whether the superblock has SB_POSIXACL set and if the inode has inode->i_{default_}acl set report the appropriate POSIX ACL name. However, we didn't realize that generic_listxattr() was only ever used by two filesystems. Both of them don't support POSIX ACLs via sb->s_xattr handlers and so never reported POSIX ACLs via generic_listxattr() even if they raised SB_POSIXACL and did contain inodes which had acls set. The example here is nfs4. As a result, generic_listxattr() suddenly started reporting POSIX ACLs when it wouldn't have before. Since SB_POSIXACL implies that the umask isn't stripped in the VFS nfs4 can't just drop SB_POSIXACL from the superblock as it would also alter umask handling for them. So just have generic_listxattr() not report POSIX ACLs as it never did anyway. It's documented as such. - Our SB_* flags currently use a signed integer and we shift the last bit causing UBSAN to complain about undefined behavior. Switch to using unsigned. While the original patch used an explicit unsigned bitshift it's now pretty common to rely on the BIT() macro in a lot of headers nowadays. So the patch has been adjusted to use that. - Add Namjae as ntfs reviewer. They're already active this cycle so let's make it explicit right now. * tag 'vfs/v6.4-rc3/misc.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: ntfs: Add myself as a reviewer fs: don't call posix_acl_listxattr in generic_listxattr fs: fix undefined behavior in bit shift for SB_NOUSER
This commit is contained in:
Коммит
9db898594c
|
@ -14927,6 +14927,7 @@ F: drivers/ntb/hw/intel/
|
|||
|
||||
NTFS FILESYSTEM
|
||||
M: Anton Altaparmakov <anton@tuxera.com>
|
||||
R: Namjae Jeon <linkinjeon@kernel.org>
|
||||
L: linux-ntfs-dev@lists.sourceforge.net
|
||||
S: Supported
|
||||
W: http://www.tuxera.com/
|
||||
|
|
15
fs/xattr.c
15
fs/xattr.c
|
@ -985,9 +985,16 @@ int xattr_list_one(char **buffer, ssize_t *remaining_size, const char *name)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
* generic_listxattr - run through a dentry's xattr list() operations
|
||||
* @dentry: dentry to list the xattrs
|
||||
* @buffer: result buffer
|
||||
* @buffer_size: size of @buffer
|
||||
*
|
||||
* Combine the results of the list() operation from every xattr_handler in the
|
||||
* list.
|
||||
* xattr_handler stack.
|
||||
*
|
||||
* Note that this will not include the entries for POSIX ACLs.
|
||||
*/
|
||||
ssize_t
|
||||
generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
|
||||
|
@ -996,10 +1003,6 @@ generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
|
|||
ssize_t remaining_size = buffer_size;
|
||||
int err = 0;
|
||||
|
||||
err = posix_acl_listxattr(d_inode(dentry), &buffer, &remaining_size);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
for_each_xattr_handler(handlers, handler) {
|
||||
if (!handler->name || (handler->list && !handler->list(dentry)))
|
||||
continue;
|
||||
|
|
|
@ -1076,29 +1076,29 @@ extern int send_sigurg(struct fown_struct *fown);
|
|||
* sb->s_flags. Note that these mirror the equivalent MS_* flags where
|
||||
* represented in both.
|
||||
*/
|
||||
#define SB_RDONLY 1 /* Mount read-only */
|
||||
#define SB_NOSUID 2 /* Ignore suid and sgid bits */
|
||||
#define SB_NODEV 4 /* Disallow access to device special files */
|
||||
#define SB_NOEXEC 8 /* Disallow program execution */
|
||||
#define SB_SYNCHRONOUS 16 /* Writes are synced at once */
|
||||
#define SB_MANDLOCK 64 /* Allow mandatory locks on an FS */
|
||||
#define SB_DIRSYNC 128 /* Directory modifications are synchronous */
|
||||
#define SB_NOATIME 1024 /* Do not update access times. */
|
||||
#define SB_NODIRATIME 2048 /* Do not update directory access times */
|
||||
#define SB_SILENT 32768
|
||||
#define SB_POSIXACL (1<<16) /* VFS does not apply the umask */
|
||||
#define SB_INLINECRYPT (1<<17) /* Use blk-crypto for encrypted files */
|
||||
#define SB_KERNMOUNT (1<<22) /* this is a kern_mount call */
|
||||
#define SB_I_VERSION (1<<23) /* Update inode I_version field */
|
||||
#define SB_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */
|
||||
#define SB_RDONLY BIT(0) /* Mount read-only */
|
||||
#define SB_NOSUID BIT(1) /* Ignore suid and sgid bits */
|
||||
#define SB_NODEV BIT(2) /* Disallow access to device special files */
|
||||
#define SB_NOEXEC BIT(3) /* Disallow program execution */
|
||||
#define SB_SYNCHRONOUS BIT(4) /* Writes are synced at once */
|
||||
#define SB_MANDLOCK BIT(6) /* Allow mandatory locks on an FS */
|
||||
#define SB_DIRSYNC BIT(7) /* Directory modifications are synchronous */
|
||||
#define SB_NOATIME BIT(10) /* Do not update access times. */
|
||||
#define SB_NODIRATIME BIT(11) /* Do not update directory access times */
|
||||
#define SB_SILENT BIT(15)
|
||||
#define SB_POSIXACL BIT(16) /* VFS does not apply the umask */
|
||||
#define SB_INLINECRYPT BIT(17) /* Use blk-crypto for encrypted files */
|
||||
#define SB_KERNMOUNT BIT(22) /* this is a kern_mount call */
|
||||
#define SB_I_VERSION BIT(23) /* Update inode I_version field */
|
||||
#define SB_LAZYTIME BIT(25) /* Update the on-disk [acm]times lazily */
|
||||
|
||||
/* These sb flags are internal to the kernel */
|
||||
#define SB_SUBMOUNT (1<<26)
|
||||
#define SB_FORCE (1<<27)
|
||||
#define SB_NOSEC (1<<28)
|
||||
#define SB_BORN (1<<29)
|
||||
#define SB_ACTIVE (1<<30)
|
||||
#define SB_NOUSER (1<<31)
|
||||
#define SB_SUBMOUNT BIT(26)
|
||||
#define SB_FORCE BIT(27)
|
||||
#define SB_NOSEC BIT(28)
|
||||
#define SB_BORN BIT(29)
|
||||
#define SB_ACTIVE BIT(30)
|
||||
#define SB_NOUSER BIT(31)
|
||||
|
||||
/* These flags relate to encoding and casefolding */
|
||||
#define SB_ENC_STRICT_MODE_FL (1 << 0)
|
||||
|
|
Загрузка…
Ссылка в новой задаче