summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorWeiping Pan <wpan@redhat.com>2013-08-13 21:46:56 +0800
committerDavid S. Miller <davem@davemloft.net>2013-08-13 19:29:08 -0700
commitd9bf5f130946695063469749bfd190087b7fad39 (patch)
treea503bf3a2373153d49d4b6fb0d0d3798a237dcb1 /drivers/net
parent3e805ad288c524bb65aad3f1e004402223d3d504 (diff)
downloadlinux-d9bf5f130946695063469749bfd190087b7fad39.tar.gz
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: Weiping Pan <wpan@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tun.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index db690a372260..5a8ee1cf090a 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -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)))