Skip to content

Commit

Permalink
tun: compare with 0 instead of total_len
Browse files Browse the repository at this point in the history
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: Weiping Pan <wpan@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Weiping Pan authored and David S. Miller committed Aug 14, 2013
1 parent 3e805ad commit d9bf5f1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
u32 rxhash;

if (!(tun->flags & TUN_NO_PI)) {
if ((len -= sizeof(pi)) > total_len)
if ((len -= sizeof(pi)) < 0)
return -EINVAL;

if (memcpy_fromiovecend((void *)&pi, iv, 0, sizeof(pi)))
Expand All @@ -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 ((len -= tun->vnet_hdr_sz) > total_len)
if ((len -= tun->vnet_hdr_sz) < 0)
return -EINVAL;

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

0 comments on commit d9bf5f1

Please sign in to comment.