Commit c1d69de9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'RED-qdisc-fixes' 



Nogah Frankel says:

====================
RED qdisc fixes

Add some input validation checks to RED qdisc.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 58117672 8afa10cb

include/net/red.h

+12 −1
Original line number Diff line number Diff line
@@ -168,6 +168,17 @@ static inline void red_set_vars(struct red_vars *v) 
	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,

				 u32 qth_min, u32 qth_max, u8 Wlog, u8 Plog,

				 u8 Scell_log, u8 *stab, u32 max_P)
@@ -179,7 +190,7 @@ static inline void red_set_parms(struct red_parms *p, 
	p->qth_max	= qth_max << Wlog;

	p->Wlog		= Wlog;

	p->Plog		= Plog;

	if (delta < 0)

	if (delta <= 0)

		delta = 1;

	p->qth_delta	= delta;

	if (!max_P) {

net/sched/sch_choke.c

+3 −0
Original line number Diff line number Diff line
@@ -369,6 +369,9 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt) 


	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)

		return -EINVAL;

net/sched/sch_gred.c

+3 −0
Original line number Diff line number Diff line
@@ -356,6 +356,9 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp, 
	struct gred_sched *table = qdisc_priv(sch);

	struct gred_sched_data *q = table->tab[dp];



	if (!red_check_params(ctl->qth_min, ctl->qth_max, ctl->Wlog))

		return -EINVAL;



	if (!q) {

		table->tab[dp] = q = *prealloc;

		*prealloc = NULL;

net/sched/sch_red.c

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,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;



	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) {

		child = fifo_create_dflt(sch, &bfifo_qdisc_ops, ctl->limit);

net/sched/sch_sfq.c

+3 −0
Original line number Diff line number Diff line
@@ -639,6 +639,9 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt) 
	if (ctl->divisor &&

	    (!is_power_of_2(ctl->divisor) || ctl->divisor > 65536))

		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) {

		p = kmalloc(sizeof(*p), GFP_KERNEL);

		if (!p)