---

yaml --- r: 233882 b: refs/heads/master c: ce3c869 h: refs/heads/master v: v3
git-mirror · Mar 7, 2011 · e2e506d · e2e506d
1 parent 94deba7
commit e2e506d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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));