f2fs: fix listxattr handling of corrupted xattr entries
PATCH 1/1 f2fs: fix listxattr handling of corrupted xattr entries
Validate the xattr entry before reading its fields in f2fs_listxattr(). Return -EFSCORRUPTED when the entry is outside the valid xattr storage area instead of returning a successful partial result.
--- fs/f2fs/xattr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/f2fs/xattr.c +4 -3
@@ -581,8 +581,6 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)size_t prefix_len;size_t size; - prefix =f2fs_xattr_prefix (entry->e_name_index, dentry); -if ((void *)(entry) +sizeof (__u32) > last_base_addr || (void *)XATTR_NEXT_ENTRY (entry) > last_base_addr) { f2fs_err(F2FS_I_SB(inode), "list inode (%llu) has corrupted xattr",
@@ -590,9 +588,12 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)set_sbi_flag (F2FS_I_SB (inode),SBI_NEED_FSCK );f2fs_handle_error (F2FS_I_SB (inode),ERROR_CORRUPTED_XATTR ); -break ; + error = -EFSCORRUPTED ; + goto cleanup; } + prefix =f2fs_xattr_prefix (entry->e_name_index, dentry); +if (!prefix)continue ;
Signature · 1 line
2.39.5
Quoted 4 lines · Keshav Verma
Validate the xattr entry before reading its fields in
f2fs_listxattr(). Return-EFSCORRUPTEDwhen the entry is outside the valid xattr storage area instead of returning a successful partial result.
Fixes line and Cc: [email protected]
Quoted 1 line
Signed-off-by Keshav Verma <[email protected]>
Thanks,
Quoted 31 lines
--- fs/f2fs/xattr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)fs/f2fs/xattr.c +4
-3@@ -581,8 +581,6 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)size_t prefix_len;size_t size; - prefix =f2fs_xattr_prefix (entry->e_name_index, dentry); -if ((void *)(entry) +sizeof (__u32) > last_base_addr || (void *)XATTR_NEXT_ENTRY (entry) > last_base_addr) { f2fs_err(F2FS_I_SB(inode), "list inode (%llu) has corrupted xattr",@@ -590,9 +588,12 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)set_sbi_flag (F2FS_I_SB (inode),SBI_NEED_FSCK );f2fs_handle_error (F2FS_I_SB (inode),ERROR_CORRUPTED_XATTR ); -break ; + error = -EFSCORRUPTED ; + goto cleanup; } + prefix =f2fs_xattr_prefix (entry->e_name_index, dentry); +if (!prefix)continue ;
PATCH v2 1/1 f2fs: fix listxattr handling of corrupted xattr entries
In reply to Keshav VermaValidate the xattr entry before reading its fields in f2fs_listxattr(). Return -EFSCORRUPTED when the entry is outside the valid xattr storage area instead of returning a successful partial result.
---
Changes in v2:
- Add Fixes tag.
- Add Reviewed-by tag.
- Add Cc: [email protected] tag.
fs/f2fs/xattr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/f2fs/xattr.c +4 -3
@@ -581,8 +581,6 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)size_t prefix_len;size_t size; - prefix =f2fs_xattr_prefix (entry->e_name_index, dentry); -if ((void *)(entry) +sizeof (__u32) > last_base_addr || (void *)XATTR_NEXT_ENTRY (entry) > last_base_addr) { f2fs_err(F2FS_I_SB(inode), "list inode (%llu) has corrupted xattr",
@@ -590,9 +588,12 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)set_sbi_flag (F2FS_I_SB (inode),SBI_NEED_FSCK );f2fs_handle_error (F2FS_I_SB (inode),ERROR_CORRUPTED_XATTR ); -break ; + error = -EFSCORRUPTED ; + goto cleanup; } + prefix =f2fs_xattr_prefix (entry->e_name_index, dentry); +if (!prefix)continue ;
Signature · 1 line
2.39.5