diff options
| author | Christian Brauner <brauner@kernel.org> | 2026-02-16 16:32:04 +0300 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2026-03-02 13:06:42 +0300 |
| commit | 8adddcb01e8f1009c0e4d4438d950d1bb794df46 (patch) | |
| tree | 69dd3f64b2e937d8bd2506069cbedd6dee3c9aca | |
| parent | 3ec90ae54dadbff30fd041796d04eac7f0474887 (diff) | |
| download | linux-8adddcb01e8f1009c0e4d4438d950d1bb794df46.tar.xz | |
xattr: switch xattr_permission() to switch statement
Simplify the codeflow by using a switch statement that switches on
S_IFMT.
Link: https://patch.msgid.link/20260216-work-xattr-socket-v1-8-c2efa4f74cb7@kernel.org
Acked-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/xattr.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/fs/xattr.c b/fs/xattr.c index c4db8663c32e..328ed7558dfc 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -152,12 +152,20 @@ xattr_permission(struct mnt_idmap *idmap, struct inode *inode, * privileged users can write attributes. */ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) { - if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode)) - return xattr_permission_error(mask); - if (S_ISDIR(inode->i_mode) && (inode->i_mode & S_ISVTX) && - (mask & MAY_WRITE) && - !inode_owner_or_capable(idmap, inode)) + switch (inode->i_mode & S_IFMT) { + case S_IFREG: + break; + case S_IFDIR: + if (!(inode->i_mode & S_ISVTX)) + break; + if (!(mask & MAY_WRITE)) + break; + if (inode_owner_or_capable(idmap, inode)) + break; return -EPERM; + default: + return xattr_permission_error(mask); + } } return inode_permission(idmap, inode, mask); |