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

Commit d8b9605d authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: fix skb->protocol use in case of accelerated vlan path 



tc code implicitly considers skb->protocol even in case of accelerated
vlan paths and expects vlan protocol type here. However, on rx path,
if the vlan header was already stripped, skb->protocol contains value
of next header. Similar situation is on tx path.

So for skbs that use skb->vlan_tci for tagging, use skb->vlan_proto instead.

Reported-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8bdda5dd

include/net/pkt_sched.h

+12 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/jiffies.h>

#include <linux/ktime.h>

#include <linux/if_vlan.h>

#include <net/sch_generic.h>



struct qdisc_walker {
@@ -114,6 +115,17 @@ int tc_classify_compat(struct sk_buff *skb, const struct tcf_proto *tp, 
int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,

		struct tcf_result *res);



static inline __be16 tc_skb_protocol(const struct sk_buff *skb)

{

	/* We need to take extra care in case the skb came via

	 * vlan accelerated path. In that case, use skb->vlan_proto

	 * as the original vlan header was already stripped.

	 */

	if (vlan_tx_tag_present(skb))

		return skb->vlan_proto;

	return skb->protocol;

}



/* Calculate maximal size of packet seen by hard_start_xmit

   routine of this device.

 */

net/sched/act_csum.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static int tcf_csum(struct sk_buff *skb, 
	if (unlikely(action == TC_ACT_SHOT))

		goto drop;



	switch (skb->protocol) {

	switch (tc_skb_protocol(skb)) {

	case cpu_to_be16(ETH_P_IP):

		if (!tcf_csum_ipv4(skb, update_flags))

			goto drop;

net/sched/cls_flow.c

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static u32 flow_get_dst(const struct sk_buff *skb, const struct flow_keys *flow) 
{

	if (flow->dst)

		return ntohl(flow->dst);

	return addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol;

	return addr_fold(skb_dst(skb)) ^ (__force u16) tc_skb_protocol(skb);

}



static u32 flow_get_proto(const struct sk_buff *skb, const struct flow_keys *flow)
@@ -98,7 +98,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb, const struct flow_keys 
	if (flow->ports)

		return ntohs(flow->port16[1]);



	return addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol;

	return addr_fold(skb_dst(skb)) ^ (__force u16) tc_skb_protocol(skb);

}



static u32 flow_get_iif(const struct sk_buff *skb)
@@ -144,7 +144,7 @@ static u32 flow_get_nfct(const struct sk_buff *skb) 


static u32 flow_get_nfct_src(const struct sk_buff *skb, const struct flow_keys *flow)

{

	switch (skb->protocol) {

	switch (tc_skb_protocol(skb)) {

	case htons(ETH_P_IP):

		return ntohl(CTTUPLE(skb, src.u3.ip));

	case htons(ETH_P_IPV6):
@@ -156,7 +156,7 @@ static u32 flow_get_nfct_src(const struct sk_buff *skb, const struct flow_keys * 


static u32 flow_get_nfct_dst(const struct sk_buff *skb, const struct flow_keys *flow)

{

	switch (skb->protocol) {

	switch (tc_skb_protocol(skb)) {

	case htons(ETH_P_IP):

		return ntohl(CTTUPLE(skb, dst.u3.ip));

	case htons(ETH_P_IPV6):

net/sched/em_ipset.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em, 
	struct net_device *dev, *indev = NULL;

	int ret, network_offset;



	switch (skb->protocol) {

	switch (tc_skb_protocol(skb)) {

	case htons(ETH_P_IP):

		acpar.family = NFPROTO_IPV4;

		if (!pskb_network_may_pull(skb, sizeof(struct iphdr)))

net/sched/em_meta.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ META_COLLECTOR(int_priority) 
META_COLLECTOR(int_protocol)

{

	/* Let userspace take care of the byte ordering */

	dst->value = skb->protocol;

	dst->value = tc_skb_protocol(skb);

}



META_COLLECTOR(int_pkttype)