diff options
| author | Weiping Pan <wpan@redhat.com> | 2013-08-13 15:46:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-14 04:29:08 +0200 |
| commit | d9bf5f130946695063469749bfd190087b7fad39 (patch) | |
| tree | a503bf3a2373153d49d4b6fb0d0d3798a237dcb1 /drivers/net/tun.c | |
| parent | rtnetlink: rtnl_bridge_getlink: Call nlmsg_find_attr() with ifinfomsg header (diff) | |
| download | linux-d9bf5f130946695063469749bfd190087b7fad39.tar.xz linux-d9bf5f130946695063469749bfd190087b7fad39.zip | |
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/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 4 |
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))) |