Skip to contentSkip to conversation

flow_dissector: Fix unaligned access in __skb_flow_dissector when used by eth_get_headlen

PATCH In review Alexander Duyck 2 participants 2 messages Feb 9, 2016

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Alexander Duyck

author
#0 lore raw

PATCH v2 1/1 flow_dissector: Fix unaligned access in __skb_flow_dissector when used by eth_get_headlen

This patch fixes an issue with unaligned accesses when using eth_get_headlen on a page that was DMA aligned instead of being IP aligned. The fact is when trying to check the length we don't need to be looking at the flow label so we can reorder the checks to first check if we are supposed to gather the flow label and then make the call to actually get it.

v2: Updated path so that either STOP_AT_FLOW_LABEL or KEY_FLOW_LABEL can
cause us to check for the flow label.

Reported-by Sowmini Varadhan <[email protected]>
Signed-off-by Alexander Duyck <[email protected]>
---
 net/core/flow_dissector.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
net/core/flow_dissector.c +6 -3
index c992463c03d7..699b2c415cb0 100644
@@ -209,7 +209,6 @@ ip:
 	case htons(ETH_P_IPV6): {
 		const struct ipv6hdr *iph;
 		struct ipv6hdr _iph;
-		__be32 flow_label;
 
 ipv6:
 		iph = __skb_header_pointer(skb, nhoff, sizeof(_iph), data, hlen, &_iph);

@@ -230,8 +229,12 @@ ipv6:
 			key_control->addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;
 		}
 
-		flow_label = ip6_flowlabel(iph);
-		if (flow_label) {
+		if ((dissector_uses_key(flow_dissector,
+					FLOW_DISSECTOR_KEY_FLOW_LABEL) ||
+		     (flags & FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL)) &&
+		    ip6_flowlabel(iph)) {
+			__be32 flow_label = ip6_flowlabel(iph);
+
 			if (dissector_uses_key(flow_dissector,
 					       FLOW_DISSECTOR_KEY_FLOW_LABEL)) {
 				key_tags = skb_flow_dissector_target(flow_dissector,
maintainer
#1 lore raw

From: Alexander Duyck <[email protected]>
Date: Tue, 09 Feb 2016 02:49:54 -0800

Quoted 7 lines

This patch fixes an issue with unaligned accesses when using eth_get_headlen on a page that was DMA aligned instead of being IP aligned. The fact is when trying to check the length we don't need to be looking at the flow label so we can reorder the checks to first check if we are supposed to gather the flow label and then make the call to actually get it.

Quoted 5 lines

v2: Updated path so that either STOP_AT_FLOW_LABEL or KEY_FLOW_LABEL can
cause us to check for the flow label.

Reported-by Sowmini Varadhan <[email protected]>
Signed-off-by Alexander Duyck <[email protected]>

Applied and queued up for -stable, thanks Alex.