Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df10db98 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

tun: fix csum generation for tap devices 



The commit 34166093 ("tuntap: use common code for virtio_net_hdr
and skb GSO conversion") replaced the tun code for header manipulation
with the generic helpers. While doing so, it implictly moved the
skb_partial_csum_set() invocation after eth_type_trans(), which
invalidate the current gso start/offset values.
Fix it by moving the helper invocation before the mac pulling.

Fixes: 34166093 ("tuntap: use common code for virtio_net_hdr and skb GSO conversion")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Acked-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 829e64d1

drivers/net/tun.c

+7 −7
Original line number Diff line number Diff line
@@ -1254,6 +1254,13 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
		return -EFAULT;

	}



	err = virtio_net_hdr_to_skb(skb, &gso, tun_is_little_endian(tun));

	if (err) {

		this_cpu_inc(tun->pcpu_stats->rx_frame_errors);

		kfree_skb(skb);

		return -EINVAL;

	}



	switch (tun->flags & TUN_TYPE_MASK) {

	case IFF_TUN:

		if (tun->flags & IFF_NO_PI) {
@@ -1280,13 +1287,6 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
		break;

	}



	err = virtio_net_hdr_to_skb(skb, &gso, tun_is_little_endian(tun));

	if (err) {

		this_cpu_inc(tun->pcpu_stats->rx_frame_errors);

		kfree_skb(skb);

		return -EINVAL;

	}



	/* copy skb_ubuf_info for callback when skb has no error */

	if (zerocopy) {

		skb_shinfo(skb)->destructor_arg = msg_control;