Commit 27d2bda4 authored by Nogah Frankel's avatar Nogah Frankel Committed by Greg Kroah-Hartman

net_sched: red: Avoid illegal values


[ Upstream commit 8afa10cb ]

Check the qmin & qmax values doesn't overflow for the given Wlog value.
Check that qmin <= qmax.

Fixes: a7834745 ("[PKT_SCHED]: Generic RED layer")
Signed-off-by: default avatarNogah Frankel <nogahf@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba51edae
...@@ -167,6 +167,17 @@ static inline void red_set_vars(struct red_vars *v) ...@@ -167,6 +167,17 @@ 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)
{
if (fls(qth_min) + Wlog > 32)
return false;
if (fls(qth_max) + Wlog > 32)
return false;
if (qth_max < qth_min)
return false;
return true;
}
static inline void red_set_parms(struct red_parms *p, static inline void red_set_parms(struct red_parms *p,
u32 qth_min, u32 qth_max, u8 Wlog, u8 Plog, u32 qth_min, u32 qth_max, u8 Wlog, u8 Plog,
u8 Scell_log, u8 *stab, u32 max_P) u8 Scell_log, u8 *stab, u32 max_P)
......
...@@ -438,6 +438,9 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt) ...@@ -438,6 +438,9 @@ 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))
return -EINVAL;
if (ctl->limit > CHOKE_MAX_QUEUE) if (ctl->limit > CHOKE_MAX_QUEUE)
return -EINVAL; return -EINVAL;
......
...@@ -389,6 +389,9 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp, ...@@ -389,6 +389,9 @@ 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))
return -EINVAL;
if (!q) { if (!q) {
table->tab[dp] = q = *prealloc; table->tab[dp] = q = *prealloc;
*prealloc = NULL; *prealloc = NULL;
......
...@@ -199,6 +199,8 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt) ...@@ -199,6 +199,8 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt)
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))
return -EINVAL;
if (ctl->limit > 0) { if (ctl->limit > 0) {
child = fifo_create_dflt(sch, &bfifo_qdisc_ops, ctl->limit); child = fifo_create_dflt(sch, &bfifo_qdisc_ops, ctl->limit);
......
...@@ -633,6 +633,9 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt) ...@@ -633,6 +633,9 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt)
if (ctl->divisor && if (ctl->divisor &&
(!is_power_of_2(ctl->divisor) || ctl->divisor > 65536)) (!is_power_of_2(ctl->divisor) || ctl->divisor > 65536))
return -EINVAL; return -EINVAL;
if (ctl_v1 && !red_check_params(ctl_v1->qth_min, ctl_v1->qth_max,
ctl_v1->Wlog))
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);
if (!p) if (!p)
......
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