| From foo@baz Mon 17 Aug 2020 11:30:21 AM CEST |
| From: Ronak Doshi <doshir@vmware.com> |
| Date: Mon, 10 Aug 2020 09:55:55 -0700 |
| Subject: vmxnet3: use correct tcp hdr length when packet is encapsulated |
| |
| From: Ronak Doshi <doshir@vmware.com> |
| |
| [ Upstream commit 8a7f280f29a80f6e0798f5d6e07c5dd8726620fe ] |
| |
| Commit dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload |
| support") added support for encapsulation offload. However, while |
| calculating tcp hdr length, it does not take into account if the |
| packet is encapsulated or not. |
| |
| This patch fixes this issue by using correct reference for inner |
| tcp header. |
| |
| Fixes: dacce2be3312 ("vmxnet3: add geneve and vxlan tunnel offload support") |
| Signed-off-by: Ronak Doshi <doshir@vmware.com> |
| Acked-by: Guolin Yang <gyang@vmware.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/vmxnet3/vmxnet3_drv.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/vmxnet3/vmxnet3_drv.c |
| +++ b/drivers/net/vmxnet3/vmxnet3_drv.c |
| @@ -861,7 +861,8 @@ vmxnet3_parse_hdr(struct sk_buff *skb, s |
| |
| switch (protocol) { |
| case IPPROTO_TCP: |
| - ctx->l4_hdr_size = tcp_hdrlen(skb); |
| + ctx->l4_hdr_size = skb->encapsulation ? inner_tcp_hdrlen(skb) : |
| + tcp_hdrlen(skb); |
| break; |
| case IPPROTO_UDP: |
| ctx->l4_hdr_size = sizeof(struct udphdr); |
