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

Commit bdba91ec authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET_SCHED]: Fix prio/ingress classification logic error 



Fix handling of empty or completely non-matching filter chains. In
that case -1 is returned and tcf_result is uninitialized, the
qdisc should fall back to default classification in that case.

Noticed by PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20283d84

net/sched/sch_ingress.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -158,9 +158,8 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch) 
			break;

			break;

		case TC_ACT_RECLASSIFY:

		case TC_ACT_RECLASSIFY:

		case TC_ACT_OK:

		case TC_ACT_OK:

		case TC_ACT_UNSPEC:

		default:

			skb->tc_index = TC_H_MIN(res.classid);

			skb->tc_index = TC_H_MIN(res.classid);

		default:

			result = TC_ACT_OK;

			result = TC_ACT_OK;

			break;

			break;

	}

	}

net/sched/sch_prio.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -38,9 +38,11 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) 
	struct prio_sched_data *q = qdisc_priv(sch);

	struct prio_sched_data *q = qdisc_priv(sch);

	u32 band = skb->priority;

	u32 band = skb->priority;

	struct tcf_result res;

	struct tcf_result res;

	int err;





	*qerr = NET_XMIT_BYPASS;

	*qerr = NET_XMIT_BYPASS;

	if (TC_H_MAJ(skb->priority) != sch->handle) {

	if (TC_H_MAJ(skb->priority) != sch->handle) {

		err = tc_classify(skb, q->filter_list, &res);

#ifdef CONFIG_NET_CLS_ACT

#ifdef CONFIG_NET_CLS_ACT

		switch (tc_classify(skb, q->filter_list, &res)) {

		switch (tc_classify(skb, q->filter_list, &res)) {

		case TC_ACT_STOLEN:

		case TC_ACT_STOLEN:
@@ -49,11 +51,8 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) 
		case TC_ACT_SHOT:

		case TC_ACT_SHOT:

			return NULL;

			return NULL;

		}

		}



		if (!q->filter_list ) {

#else

		if (!q->filter_list || tc_classify(skb, q->filter_list, &res)) {

#endif

#endif

		if (!q->filter_list || err < 0) {

			if (TC_H_MAJ(band))

			if (TC_H_MAJ(band))

				band = 0;

				band = 0;

			band = q->prio2band[band&TC_PRIO_MAX];

			band = q->prio2band[band&TC_PRIO_MAX];