[PATCH 2.6.26.y] sch_prio: Fix nla_parse_nested_compat() regression
From: Thomas Graf <tgraf@suug.ch>
Date: 2008-08-28 13:03:26
Also in:
lkml
nla_parse_nested_compat() was used to parse two different message formats in the netem and prio qdisc, when it was "fixed" to work with netem, it broke the multi queue support in the prio qdisc. Since the prio qdisc code in question is already removed in the development tree, this patch only fixes the regression in the stable tree. Based on original patch from Alexander H Duyck [off-list ref] Signed-off-by: Thomas Graf <tgraf@suug.ch> Index: linux-2.6.26.y/net/sched/sch_prio.c ===================================================================
--- linux-2.6.26.y.orig/net/sched/sch_prio.c 2008-08-28 13:24:22.000000000 +0200
+++ linux-2.6.26.y/net/sched/sch_prio.c 2008-08-28 14:16:44.000000000 +0200@@ -228,14 +228,20 @@ { struct prio_sched_data *q = qdisc_priv(sch); struct tc_prio_qopt *qopt; - struct nlattr *tb[TCA_PRIO_MAX + 1]; + struct nlattr *tb[TCA_PRIO_MAX + 1] = {0}; int err; int i; - err = nla_parse_nested_compat(tb, TCA_PRIO_MAX, opt, NULL, qopt, - sizeof(*qopt)); - if (err < 0) - return err; + qopt = nla_data(opt); + if (nla_len(opt) < sizeof(*qopt)) + return -1; + + if (nla_len(opt) >= sizeof(*qopt) + sizeof(struct nlattr)) { + err = nla_parse_nested(tb, TCA_PRIO_MAX, + (struct nlattr *) (qopt + 1), NULL); + if (err < 0) + return err; + } q->bands = qopt->bands; /* If we're multiqueue, make sure the number of incoming bands