]> www.infradead.org Git - users/jedix/linux-maple.git/commit
flow_dissector: Fix unaligned access in __skb_flow_dissector when used by eth_get_headlen
authorAlexander Duyck <aduyck@mirantis.com>
Tue, 9 Feb 2016 10:49:54 +0000 (02:49 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:45:20 +0000 (15:45 -0700)
commitc622c227f46e9b57a970879ed15e26a8c00d3b64
tree99bd03b55ab0064430fdebb9add44de3e62b2f36
parentd74345037dcb52c1dd1285dd173c48105b788f89
flow_dissector: Fix unaligned access in __skb_flow_dissector when used by eth_get_headlen

Orabug: stable_rc4

[ Upstream commit 461547f3158978c180d74484d58e82be9b8e7357, since
  we lack the flow dissector flags in this release we guard the
  flow label access using a test on 'skb' being NULL ]

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 <sowmini.varadhan@oracle.com>
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 916f99656dc7d69355cb1045530c421cb1976590)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
net/core/flow_dissector.c