From e2e506d060c5797c07ef2f568885545e55190db9 Mon Sep 17 00:00:00 2001 From: Nicolas Kaiser Date: Fri, 4 Mar 2011 13:49:41 +0000 Subject: [PATCH] --- yaml --- r: 233882 b: refs/heads/master c: ce3c869283739379134e1a90c37dd1a30b5f31b7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/macvtap.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 14a663922a63..002d1ef5b018 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3ca9b02b00704053a38bfe4c31dbbb9c13595d0 +refs/heads/master: ce3c869283739379134e1a90c37dd1a30b5f31b7 diff --git a/trunk/drivers/net/macvtap.c b/trunk/drivers/net/macvtap.c index 5933621ac3ff..fc27a9926d9e 100644 --- a/trunk/drivers/net/macvtap.c +++ b/trunk/drivers/net/macvtap.c @@ -528,8 +528,9 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, vnet_hdr_len = q->vnet_hdr_sz; err = -EINVAL; - if ((len -= vnet_hdr_len) < 0) + if (len < vnet_hdr_len) goto err; + len -= vnet_hdr_len; err = memcpy_fromiovecend((void *)&vnet_hdr, iv, 0, sizeof(vnet_hdr));