tun: compare with 0 instead of total_len
authorWeiping Pan <wpan@redhat.com>
Tue, 13 Aug 2013 13:46:56 +0000 (21:46 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 14 Aug 2013 02:29:08 +0000 (19:29 -0700)
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>
drivers/net/tun.c

index db690a372260786b395186dffb38ea24e58d45ee..5a8ee1cf090a3ca693ac26e5bc3e68479b93a54b 100644 (file)
@@ -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)))
@@ -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)))