Unverified Commit 575bcc0b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15798 ksmbd: fix out-of-bounds in parse_sec_desc() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongjian Sun <sunyongjian1@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/IGYS4FYBWRZ67YLE4WB4BHAQD64CYVGK/ 
 
https://gitee.com/openeuler/kernel/issues/IBY448 
 
Link:https://gitee.com/openeuler/kernel/pulls/15798

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 25340e11 b83cb25c

fs/smb/server/smbacl.c

+16 −0
Original line number Diff line number Diff line
@@ -807,6 +807,13 @@ static int parse_sid(struct smb_sid *psid, char *end_of_acl) 
		return -EINVAL;

	}



	if (!psid->num_subauth)

		return 0;



	if (psid->num_subauth > SID_MAX_SUB_AUTHORITIES ||

	    end_of_acl < (char *)psid + 8 + sizeof(__le32) * psid->num_subauth)

		return -EINVAL;



	return 0;

}
@@ -848,6 +855,9 @@ int parse_sec_desc(struct mnt_idmap *idmap, struct smb_ntsd *pntsd, 
	pntsd->type = cpu_to_le16(DACL_PRESENT);



	if (pntsd->osidoffset) {

		if (le32_to_cpu(pntsd->osidoffset) < sizeof(struct smb_ntsd))

			return -EINVAL;



		rc = parse_sid(owner_sid_ptr, end_of_acl);

		if (rc) {

			pr_err("%s: Error %d parsing Owner SID\n", __func__, rc);
@@ -863,6 +873,9 @@ int parse_sec_desc(struct mnt_idmap *idmap, struct smb_ntsd *pntsd, 
	}



	if (pntsd->gsidoffset) {

		if (le32_to_cpu(pntsd->gsidoffset) < sizeof(struct smb_ntsd))

			return -EINVAL;



		rc = parse_sid(group_sid_ptr, end_of_acl);

		if (rc) {

			pr_err("%s: Error %d mapping Owner SID to gid\n",
@@ -884,6 +897,9 @@ int parse_sec_desc(struct mnt_idmap *idmap, struct smb_ntsd *pntsd, 
		pntsd->type |= cpu_to_le16(DACL_PROTECTED);



	if (dacloffset) {

		if (dacloffset < sizeof(struct smb_ntsd))

			return -EINVAL;



		parse_dacl(idmap, dacl_ptr, end_of_acl,

			   owner_sid_ptr, group_sid_ptr, fattr);

	}