|
@@ -1074,8 +1074,9 @@ 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)) < 0)
|
|
|
+ if (len < sizeof(pi))
|
|
|
return -EINVAL;
|
|
|
+ len -= sizeof(pi);
|
|
|
|
|
|
if (memcpy_fromiovecend((void *)&pi, iv, 0, sizeof(pi)))
|
|
|
return -EFAULT;
|
|
@@ -1083,8 +1084,9 @@ 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) < 0)
|
|
|
+ if (len < tun->vnet_hdr_sz)
|
|
|
return -EINVAL;
|
|
|
+ len -= tun->vnet_hdr_sz;
|
|
|
|
|
|
if (memcpy_fromiovecend((void *)&gso, iv, offset, sizeof(gso)))
|
|
|
return -EFAULT;
|