Skip to content

Commit 4d56304

Browse files
HBh25YPaolo Abeni
authored andcommitted
net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
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: 0a6e777 ("net/sched: allow flower to match tunnel options") Signed-off-by: Hangyu Hua <hbh25y@gmail.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Reviewed-by: Pieter Jansen van Vuuren <pieter.jansen-van-vuuren@amd.com> Link: https://lore.kernel.org/r/20230531102805.27090-1-hbh25y@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 622ab65 commit 4d56304

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

net/sched/cls_flower.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,9 @@ static int fl_set_geneve_opt(const struct nlattr *nla, struct fl_flow_key *key,
11531153
if (option_len > sizeof(struct geneve_opt))
11541154
data_len = option_len - sizeof(struct geneve_opt);
11551155

1156+
if (key->enc_opts.len > FLOW_DIS_TUN_OPTS_MAX - 4)
1157+
return -ERANGE;
1158+
11561159
opt = (struct geneve_opt *)&key->enc_opts.data[key->enc_opts.len];
11571160
memset(opt, 0xff, option_len);
11581161
opt->length = data_len / 4;

0 commit comments

Comments
 (0)