ext4: introduce ITAIL helper

[ Upstream commit 69f3a3039b0d0003de008659cafd5a1eaaa0a7a4 ]

Introduce ITAIL helper to get the bound of xattr in inode.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20250208063141.1539283-2-yebin@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: David Nyström <david.nystrom@est.tech>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 8a7045d8a55571e575e124b0f935addb98413d75..84c94f11e06e30f0c6dd1967df7f9840e3338781 100644 (file)
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -599,7 +599,7 @@ ext4_xattr_ibody_get(struct inode *inode, int name_index, const char *name,
                return error;
        raw_inode = ext4_raw_inode(&iloc);
        header = IHDR(inode, raw_inode);
-       end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
+       end = ITAIL(inode, raw_inode);
        error = xattr_check_inode(inode, header, end);
        if (error)
                goto cleanup;
@@ -744,7 +744,7 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size)
                return error;
        raw_inode = ext4_raw_inode(&iloc);
        header = IHDR(inode, raw_inode);
-       end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
+       end = ITAIL(inode, raw_inode);
        error = xattr_check_inode(inode, header, end);
        if (error)
                goto cleanup;
@@ -826,7 +826,7 @@ int ext4_get_inode_usage(struct inode *inode, qsize_t *usage)
                        goto out;
                raw_inode = ext4_raw_inode(&iloc);
                header = IHDR(inode, raw_inode);
-               end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
+               end = ITAIL(inode, raw_inode);
                ret = xattr_check_inode(inode, header, end);
                if (ret)
                        goto out;
@@ -2219,7 +2219,7 @@ int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i,
        header = IHDR(inode, raw_inode);
        is->s.base = is->s.first = IFIRST(header);
        is->s.here = is->s.first;
-       is->s.end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
+       is->s.end = ITAIL(inode, raw_inode);
        if (ext4_test_inode_state(inode, EXT4_STATE_XATTR)) {
                error = xattr_check_inode(inode, header, is->s.end);
                if (error)
@@ -2743,7 +2743,7 @@ retry:
         */
 
        base = IFIRST(header);
-       end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size;
+       end = ITAIL(inode, raw_inode);
        min_offs = end - base;
        total_ino = sizeof(struct ext4_xattr_ibody_header) + sizeof(u32);
 

diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
index e5e36bd11f0556697e170c55a4690786e7e848a2..9a596e19c2b14b6c3352077f7d54a107bee5c03b 100644 (file)
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h
@@ -68,6 +68,9 @@ struct ext4_xattr_entry {
                ((void *)raw_inode + \
                EXT4_GOOD_OLD_INODE_SIZE + \
                EXT4_I(inode)->i_extra_isize))
+#define ITAIL(inode, raw_inode) \
+       ((void *)(raw_inode) + \
+        EXT4_SB((inode)->i_sb)->s_inode_size)
 #define IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr)+1))
 
 /*