mirror of
https://github.com/torvalds/linux
synced 2024-07-08 20:29:39 +00:00
c77194965d
This reverts commit 484fd6c1de. The
commit caused a regression because now the umask was applied to
symlinks and the fix is unnecessary because the umask/O_TMPFILE bug
has been fixed somewhere else already.
Fixes: https://lore.kernel.org/lkml/28DSITL9912E1.2LSZUVTGTO52Q@mforney.org/
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Tested-by: Michael Forney <mforney@mforney.org>
Link: https://lore.kernel.org/r/20240315142956.2420360-1-max.kellermann@ionos.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
75 lines
1.6 KiB
C
75 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
File: fs/ext4/acl.h
|
|
|
|
(C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
|
|
*/
|
|
|
|
#include <linux/posix_acl_xattr.h>
|
|
|
|
#define EXT4_ACL_VERSION 0x0001
|
|
|
|
typedef struct {
|
|
__le16 e_tag;
|
|
__le16 e_perm;
|
|
__le32 e_id;
|
|
} ext4_acl_entry;
|
|
|
|
typedef struct {
|
|
__le16 e_tag;
|
|
__le16 e_perm;
|
|
} ext4_acl_entry_short;
|
|
|
|
typedef struct {
|
|
__le32 a_version;
|
|
} ext4_acl_header;
|
|
|
|
static inline size_t ext4_acl_size(int count)
|
|
{
|
|
if (count <= 4) {
|
|
return sizeof(ext4_acl_header) +
|
|
count * sizeof(ext4_acl_entry_short);
|
|
} else {
|
|
return sizeof(ext4_acl_header) +
|
|
4 * sizeof(ext4_acl_entry_short) +
|
|
(count - 4) * sizeof(ext4_acl_entry);
|
|
}
|
|
}
|
|
|
|
static inline int ext4_acl_count(size_t size)
|
|
{
|
|
ssize_t s;
|
|
size -= sizeof(ext4_acl_header);
|
|
s = size - 4 * sizeof(ext4_acl_entry_short);
|
|
if (s < 0) {
|
|
if (size % sizeof(ext4_acl_entry_short))
|
|
return -1;
|
|
return size / sizeof(ext4_acl_entry_short);
|
|
} else {
|
|
if (s % sizeof(ext4_acl_entry))
|
|
return -1;
|
|
return s / sizeof(ext4_acl_entry) + 4;
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_EXT4_FS_POSIX_ACL
|
|
|
|
/* acl.c */
|
|
struct posix_acl *ext4_get_acl(struct inode *inode, int type, bool rcu);
|
|
int ext4_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
|
|
struct posix_acl *acl, int type);
|
|
extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);
|
|
|
|
#else /* CONFIG_EXT4_FS_POSIX_ACL */
|
|
#include <linux/sched.h>
|
|
#define ext4_get_acl NULL
|
|
#define ext4_set_acl NULL
|
|
|
|
static inline int
|
|
ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_EXT4_FS_POSIX_ACL */
|
|
|