Commit 4cd177d4 authored by Hangyu Hua's avatar Hangyu Hua Committed by Zhengchao Shao
Browse files

net/sched: flower: fix possible OOB write in fl_set_geneve_opt() 

stable inclusion
from stable-v5.10.183
commit 7c5c67aa294444b53f697dc3ddce61b33ff8badd
category: bugfix
bugzilla: 188914
CVE: CVE-2023-35788

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7c5c67aa294444b53f697dc3ddce61b33ff8badd



--------------------------------

[ Upstream commit 4d56304e ]

If we send two TCA_FLOWER_KEY_ENC_OPTS_GENEVE packets and their total
size is 252 bytes(key->enc_opts.len = 252) then
key->enc_opts.len = opt->length = data_len / 4 = 0 when the third
TCA_FLOWER_KEY_ENC_OPTS_GENEVE packet enters fl_set_geneve_opt. This
bypasses the next bounds check and results in an out-of-bounds.

Fixes: 0a6e7778 ("net/sched: allow flower to match tunnel options")
Signed-off-by: default avatarHangyu Hua <hbh25y@gmail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarPieter Jansen van Vuuren <pieter.jansen-van-vuuren@amd.com>
Link: https://lore.kernel.org/r/20230531102805.27090-1-hbh25y@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
parent 65dc09da

net/sched/cls_flower.c

+3 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,9 @@ static int fl_set_geneve_opt(const struct nlattr *nla, struct fl_flow_key *key, 
	if (option_len > sizeof(struct geneve_opt))

		data_len = option_len - sizeof(struct geneve_opt);



	if (key->enc_opts.len > FLOW_DIS_TUN_OPTS_MAX - 4)

		return -ERANGE;



	opt = (struct geneve_opt *)&key->enc_opts.data[key->enc_opts.len];

	memset(opt, 0xff, option_len);

	opt->length = data_len / 4;