f2fs: fix to avoid memory leakage in f2fs_listxattr
PATCH 1/1 f2fs: fix to avoid memory leakage in f2fs_listxattr
In f2fs_listxattr, there is no boundary check before memcpy e_name to buffer.
If the e_name_len is corrupted,
unexpected memory contents may be returned to the buffer.
--- fs/f2fs/xattr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
fs/f2fs/xattr.c +13 -1
@@ -538,8 +538,9 @@ int f2fs_getxattr(struct inode *inode, int index, const char *name,ssize_t f2fs_listxattr (struct dentry *dentry,char *buffer,size_t buffer_size) {struct inode *inode =d_inode (dentry); +nid_t xnid =F2FS_I (inode)->i_xattr_nid;struct f2fs_xattr_entry *entry; -void *base_addr; +void *base_addr, *last_base_addr;int error =0 ;size_t rest = buffer_size;
@@ -549,6 +550,8 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)if (error)return error; + last_base_addr = (void *)base_addr +XATTR_SIZE (xnid, inode); +list_for_each_xattr (entry, base_addr) {const struct xattr_handler *handler =f2fs_xattr_handler (entry->e_name_index);
@@ -559,6 +562,15 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)if (!handler || (handler->list && !handler->list (dentry)))continue ; +if ((void *)(entry) +sizeof (__u32) > last_base_addr || + (void *)XATTR_NEXT_ENTRY (entry) > last_base_addr) { +f2fs_err (F2FS_I_SB (inode),"inode (%lu) has corrupted xattr" , + inode->i_ino); +set_sbi_flag (F2FS_I_SB (inode),SBI_NEED_FSCK ); + error = -EFSCORRUPTED ; + goto cleanup; + } + prefix =xattr_prefix (handler); prefix_len =strlen (prefix); size = prefix_len + entry->e_name_len +1 ;
Signature · 1 line
2.23.0.581.g78d2f28ef7-goog
Hi Randall,
Quoted 36 lines · Randall Huang
In
f2fs_listxattr, there is no boundary check before memcpye_nameto buffer.
If thee_name_lenis corrupted,
unexpected memory contents may be returned to the buffer.Signed-off-by Randall Huang <[email protected]>--- fs/f2fs/xattr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)fs/f2fs/xattr.c +4
-1@@ -538,8 +538,9 @@ int f2fs_getxattr(struct inode *inode, int index, const char *name,ssize_t f2fs_listxattr (struct dentry *dentry,char *buffer,size_t buffer_size) {struct inode *inode =d_inode (dentry); +nid_t xnid =F2FS_I (inode)->i_xattr_nid;struct f2fs_xattr_entry *entry; -void *base_addr; +void *base_addr, *last_base_addr;int error =0 ;size_t rest = buffer_size;@@ -549,6 +550,8 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)if (error)return error; + last_base_addr = (void *)base_addr +XATTR_SIZE (xnid, inode); +list_for_each_xattr (entry, base_addr) {const struct xattr_handler *handler =f2fs_xattr_handler (entry->e_name_index);@@ -559,6 +562,15 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)if (!handler || (handler->list && !handler->list (dentry)))
fs/f2fs/xattr.c ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) · line 572
Quoted 10 lines
fs/f2fs/xattr.c +8
-0continue ; +if ((void *)(entry) +sizeof (__u32) > last_base_addr || + (void *)XATTR_NEXT_ENTRY (entry) > last_base_addr) { +f2fs_err (F2FS_I_SB (inode),"inode (%lu) has corrupted xattr" , + inode->i_ino); +set_sbi_flag (F2FS_I_SB (inode),SBI_NEED_FSCK ); + error = -EFSCORRUPTED ; + goto cleanup; + }
Could you relocate sanity check to the place before we check handler? As I'm thinking we should always check validation of current entry before using its field (entry->index).
Thanks,
fs/f2fs/xattr.c ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) · line 576
Quoted 5 lines
fs/f2fs/xattr.c +1
-0+ prefix =xattr_prefix (handler); prefix_len =strlen (prefix); size = prefix_len + entry->e_name_len +1 ;
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH v2 1/1 f2fs: fix to avoid memory leakage in f2fs_listxattr
In f2fs_listxattr, there is no boundary check before memcpy e_name to buffer.
If the e_name_len is corrupted,
unexpected memory contents may be returned to the buffer.
---
v2:
relocate sanity check
--- fs/f2fs/xattr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
fs/f2fs/xattr.c +13 -1
@@ -539,8 +539,9 @@ int f2fs_getxattr(struct inode *inode, int index, const char *name,ssize_t f2fs_listxattr (struct dentry *dentry,char *buffer,size_t buffer_size) {struct inode *inode =d_inode (dentry); +nid_t xnid =F2FS_I (inode)->i_xattr_nid;struct f2fs_xattr_entry *entry; -void *base_addr; +void *base_addr, *last_base_addr;int error =0 ;size_t rest = buffer_size;
@@ -550,6 +551,8 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)if (error)return error; + last_base_addr = (void *)base_addr +XATTR_SIZE (xnid, inode); +list_for_each_xattr (entry, base_addr) {const struct xattr_handler *handler =f2fs_xattr_handler (entry->e_name_index);
@@ -557,6 +560,15 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)size_t prefix_len;size_t size; +if ((void *)(entry) +sizeof (__u32) > last_base_addr || + (void *)XATTR_NEXT_ENTRY (entry) > last_base_addr) { +f2fs_err (F2FS_I_SB (inode),"inode (%lu) has corrupted xattr" , + inode->i_ino); +set_sbi_flag (F2FS_I_SB (inode),SBI_NEED_FSCK ); + error = -EFSCORRUPTED ; + goto cleanup; + } +if (!handler || (handler->list && !handler->list (dentry)))continue ;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Quoted 6 lines · Randall Huang
In
f2fs_listxattr, there is no boundary check before memcpye_nameto buffer.
If thee_name_lenis corrupted,
unexpected memory contents may be returned to the buffer.Signed-off-by Randall Huang <[email protected]>
Thanks,