Unverified Commit 91bb88ce authored Feb 08, 2025 by openeuler-ci-bot Committed by Gitee Feb 08, 2025

!15039 mptcp: fix TCP options overflow.

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OZA6LWTPVKYQU4TPUDMC6YWKN5L3R6OQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBID34 
 
Link:https://gitee.com/openeuler/kernel/pulls/15039

 

Reviewed-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: Zhang Peng <zhangpeng362@huawei.com>

parents a7091d84 bbcf268a

net/mptcp/options.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -667,8 +667,15 @@ static bool mptcp_established_options_add_addr(struct sock sk, struct sk_buff
		&echo, &drop_other_suboptions))
		return false;

		/*
		* Later on, mptcp_write_options() will enforce mutually exclusion with
		* DSS, bail out if such option is set and we can't drop it.
		*/
		if (drop_other_suboptions)
		remaining += opt_size;
		else if (opts->suboptions & OPTION_MPTCP_DSS)
		return false;

		len = mptcp_add_addr_len(opts->addr.family, echo, !!opts->addr.port);
		if (remaining < len)
		return false;