summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorDaniel Borkmann <daniel@iogearbox.net>2016-04-16 02:27:58 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-18 17:06:36 -0700
commita66ce519a3e9aca63739da0d716555588df5cc48 (patch)
tree87a99a4511fd56c5e09ce8a48cc15736d9b8a5ef /drivers/net/ethernet
parent79fdabe8706bd240c083a848f64081a4bc46d7af (diff)
vlan: pull on __vlan_insert_tag error path and fix csum correction
[ Upstream commit 9241e2df4fbc648a92ea0752918e05c26255649e ] When __vlan_insert_tag() fails from skb_vlan_push() path due to the skb_cow_head(), we need to undo the __skb_push() in the error path as well that was done earlier to move skb->data pointer to mac header. Moreover, I noticed that when in the non-error path the __skb_pull() is done and the original offset to mac header was non-zero, we fixup from a wrong skb->data offset in the checksum complete processing. So the skb_postpush_rcsum() really needs to be done before __skb_pull() where skb->data still points to the mac header start and thus operates under the same conditions as in __vlan_insert_tag(). Fixes: 93515d53b133 ("net: move vlan pop/push functions into common code") Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet')
0 files changed, 0 insertions, 0 deletions