Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40edeff6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net_sched: qdisc_get_rtab() must check data[] array 



qdisc_get_rtab() should check not only the keys in struct tc_ratespec,
but also the full data[] array.

"tc ... linklayer atm " only perturbs values in the 256 slots array.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1612e111

net/sched/sch_api.c

+6 −5
Original line number Diff line number Diff line
@@ -291,17 +291,18 @@ struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, struct nlattr *ta 
{

	struct qdisc_rate_table *rtab;



	if (tab == NULL || r->rate == 0 || r->cell_log == 0 ||

	    nla_len(tab) != TC_RTAB_SIZE)

		return NULL;



	for (rtab = qdisc_rtab_list; rtab; rtab = rtab->next) {

		if (memcmp(&rtab->rate, r, sizeof(struct tc_ratespec)) == 0) {

		if (!memcmp(&rtab->rate, r, sizeof(struct tc_ratespec)) &&

		    !memcmp(&rtab->data, nla_data(tab), 1024)) {

			rtab->refcnt++;

			return rtab;

		}

	}



	if (tab == NULL || r->rate == 0 || r->cell_log == 0 ||

	    nla_len(tab) != TC_RTAB_SIZE)

		return NULL;



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

	if (rtab) {

		rtab->rate = *r;