Unverified Commit 365ea86d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10315 jfs: xattr: fix buffer overflow for invalid xattr 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xia Fukun <xiafukun@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZWGMGTUDYSD3UL4XSGH7BTU56NRVX4FD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAD0FK 
 
Link:https://gitee.com/openeuler/kernel/pulls/10315

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 828b7a33 c7637ab2

fs/jfs/xattr.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -570,9 +570,11 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size) 




      size_check:

      size_check:

	if (EALIST_SIZE(ea_buf->xattr) != ea_size) {

	if (EALIST_SIZE(ea_buf->xattr) != ea_size) {

		int size = min_t(int, EALIST_SIZE(ea_buf->xattr), ea_size);



		printk(KERN_ERR "ea_get: invalid extended attribute\n");

		printk(KERN_ERR "ea_get: invalid extended attribute\n");

		print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1,

		print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1,

				     ea_buf->xattr, ea_size, 1);

				     ea_buf->xattr, size, 1);

		ea_release(inode, ea_buf);

		ea_release(inode, ea_buf);

		rc = -EIO;

		rc = -EIO;

		goto clean_up;

		goto clean_up;