Commit bd1248f1 authored by Randy Dunlap's avatar Randy Dunlap Committed by David S. Miller

net: sched: prevent invalid Scell_log shift count

Check Scell_log shift size in red_check_params() and modify all callers
of red_check_params() to pass Scell_log.

This prevents a shift out-of-bounds as detected by UBSAN:
  UBSAN: shift-out-of-bounds in ./include/net/red.h:252:22
  shift exponent 72 is too large for 32-bit type 'int'

Fixes: 8afa10cb ("net_sched: red: Avoid illegal values")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reported-by: syzbot+97c5bd9cc81eca63d36e@syzkaller.appspotmail.com
Cc: Nogah Frankel <nogahf@mellanox.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Cc: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a533b70a
...@@ -168,12 +168,14 @@ static inline void red_set_vars(struct red_vars *v) ...@@ -168,12 +168,14 @@ static inline void red_set_vars(struct red_vars *v)
v->qcount = -1; v->qcount = -1;
} }
static inline bool red_check_params(u32 qth_min, u32 qth_max, u8 Wlog) static inline bool red_check_params(u32 qth_min, u32 qth_max, u8 Wlog, u8 Scell_log)
{ {
if (fls(qth_min) + Wlog > 32) if (fls(qth_min) + Wlog > 32)
return false; return false;
if (fls(qth_max) + Wlog > 32) if (fls(qth_max) + Wlog > 32)
return false; return false;
if (Scell_log >= 32)
return false;
if (qth_max < qth_min) if (qth_max < qth_min)
return false; return false;
return true; return true;
......
...@@ -362,7 +362,7 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt, ...@@ -362,7 +362,7 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt,
ctl = nla_data(tb[TCA_CHOKE_PARMS]); ctl = nla_data(tb[TCA_CHOKE_PARMS]);
if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog)) if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog, ctl->Scell_log))
return -EINVAL; return -EINVAL;
if (ctl->limit > CHOKE_MAX_QUEUE) if (ctl->limit > CHOKE_MAX_QUEUE)
......
...@@ -480,7 +480,7 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp, ...@@ -480,7 +480,7 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp,
struct gred_sched *table = qdisc_priv(sch); struct gred_sched *table = qdisc_priv(sch);
struct gred_sched_data *q = table->tab[dp]; struct gred_sched_data *q = table->tab[dp];
if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog)) { if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog, ctl->Scell_log)) {
NL_SET_ERR_MSG_MOD(extack, "invalid RED parameters"); NL_SET_ERR_MSG_MOD(extack, "invalid RED parameters");
return -EINVAL; return -EINVAL;
} }
......
...@@ -250,7 +250,7 @@ static int __red_change(struct Qdisc *sch, struct nlattr **tb, ...@@ -250,7 +250,7 @@ static int __red_change(struct Qdisc *sch, struct nlattr **tb,
max_P = tb[TCA_RED_MAX_P] ? nla_get_u32(tb[TCA_RED_MAX_P]) : 0; max_P = tb[TCA_RED_MAX_P] ? nla_get_u32(tb[TCA_RED_MAX_P]) : 0;
ctl = nla_data(tb[TCA_RED_PARMS]); ctl = nla_data(tb[TCA_RED_PARMS]);
if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog)) if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog, ctl->Scell_log))
return -EINVAL; return -EINVAL;
err = red_get_flags(ctl->flags, TC_RED_HISTORIC_FLAGS, err = red_get_flags(ctl->flags, TC_RED_HISTORIC_FLAGS,
......
...@@ -647,7 +647,7 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt) ...@@ -647,7 +647,7 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt)
} }
if (ctl_v1 && !red_check_params(ctl_v1->qth_min, ctl_v1->qth_max, if (ctl_v1 && !red_check_params(ctl_v1->qth_min, ctl_v1->qth_max,
ctl_v1->Wlog)) ctl_v1->Wlog, ctl_v1->Scell_log))
return -EINVAL; return -EINVAL;
if (ctl_v1 && ctl_v1->qth_min) { if (ctl_v1 && ctl_v1->qth_min) {
p = kmalloc(sizeof(*p), GFP_KERNEL); p = kmalloc(sizeof(*p), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment