ixgbe: Avoid unaligned access in ixgbe_atr() for LLC packets
Subsystems (3)
PATCH 1/1 ixgbe: Avoid unaligned access in ixgbe_atr() for LLC packets
For LLC based protocols like lldp, stp etc., the ethernet header is an 802.3 header with a h_proto that is not 0x800, 0x86dd, or even 0x806. In this world, the skb_network_header() points at the DSAP/SSAP/.. and is not likely to be NET_IP_ALIGNed in ixgbe_atr().
With LLC, drivers are not likely to correctly find IPVERSION, or "6", at hdr.ipv4->version, but will instead just needlessly trigger an unaligned access. (IPv4/IPv6 over LLC is almost never implemented).
The unaligned access is thus avoidable: bail out quickly after examining skb->protocol.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +5 -0
@@ -7602,6 +7602,11 @@ static void ixgbe_atr(struct ixgbe_ring *ring,#endif /* CONFIG_IXGBE_VXLAN */ } +if (skb->protocol !=htons (ETH_P_IP ) && + skb->protocol !=htons (ETH_P_IPV6 ) && + skb->protocol !=htons (ETH_P_ARP )) +return ; +/* Currently only IPv4/IPv6 with TCP is supported */ switch (hdr.ipv4->version) {case IPVERSION :
Signature · 1 line
1.7.1
Quoted 25 lines · Sowmini Varadhan
For LLC based protocols like lldp, stp etc., the ethernet header is an 802.3 header with a
h_protothat is not0x800,0x86dd, or even0x806. In this world, theskb_network_header()points at the DSAP/SSAP/.. and is not likely to beNET_IP_ALIGNedinixgbe_atr().With LLC, drivers are not likely to correctly find IPVERSION, or "6", at
hdr.ipv4->version, but will instead just needlessly trigger an unaligned access. (IPv4/IPv6 over LLC is almost never implemented).The unaligned access is thus avoidable: bail out quickly after examining
skb->protocol.Signed-off-by Sowmini Varadhan <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0
-0
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c static void ixgbe_atr(struct ixgbe_ring *ring, · line 7609
Quoted 8 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +5
-0@@ -7602,6 +7602,11 @@ static void ixgbe_atr(struct ixgbe_ring *ring,#endif /* CONFIG_IXGBE_VXLAN */ } +if (skb->protocol !=htons (ETH_P_IP ) && + skb->protocol !=htons (ETH_P_IPV6 ) && + skb->protocol !=htons (ETH_P_ARP )) +return ; +
This is disabling too much as it snags VLAN along with everything else. Replace skb->protocol with first->protocol and this should work correctly.
You may also want to move it up by several lines so that you don't count it as a valid ATR frame via atr_count.
Thanks.
- Alex