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

Commit d9bf5f13 authored by Weiping Pan's avatar Weiping Pan Committed by David S. Miller
Browse files

tun: compare with 0 instead of total_len 



Since we set "len = total_len" in the beginning of tun_get_user(),
so we should compare the new len with 0, instead of total_len,
or the if statement always returns false.

Signed-off-by: default avatarWeiping Pan <wpan@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e805ad2

drivers/net/tun.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1074,7 +1074,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
	u32 rxhash;

	u32 rxhash;





	if (!(tun->flags & TUN_NO_PI)) {

	if (!(tun->flags & TUN_NO_PI)) {

		if ((len -= sizeof(pi)) > total_len)

		if ((len -= sizeof(pi)) < 0)

			return -EINVAL;

			return -EINVAL;





		if (memcpy_fromiovecend((void *)&pi, iv, 0, sizeof(pi)))

		if (memcpy_fromiovecend((void *)&pi, iv, 0, sizeof(pi)))
@@ -1083,7 +1083,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, 
	}

	}





	if (tun->flags & TUN_VNET_HDR) {

	if (tun->flags & TUN_VNET_HDR) {

		if ((len -= tun->vnet_hdr_sz) > total_len)

		if ((len -= tun->vnet_hdr_sz) < 0)

			return -EINVAL;

			return -EINVAL;





		if (memcpy_fromiovecend((void *)&gso, iv, offset, sizeof(gso)))

		if (memcpy_fromiovecend((void *)&gso, iv, offset, sizeof(gso)))