From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 23 Feb 2017 16:19:41 +0000 (+0100)
Subject: vxlan: correctly validate VXLAN ID against VXLAN_N_VID
X-Git-Tag: v4.10.5~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36ec2150ae0a6e29ab11964e534811c4201c4b34;p=thirdparty%2Fkernel%2Fstable.git

vxlan: correctly validate VXLAN ID against VXLAN_N_VID

[ Upstream commit 4e37d6911f36545b286d15073f6f2222f840e81c ]

The incorrect check caused an off-by-one error: the maximum VID 0xffffff
was unusable.

Fixes: d342894c5d2f ("vxlan: virtual extensible lan")
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Acked-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 30b04cf2bb1e0..d646775b68329 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2626,7 +2626,7 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[])
 
 	if (data[IFLA_VXLAN_ID]) {
 		__u32 id = nla_get_u32(data[IFLA_VXLAN_ID]);
-		if (id >= VXLAN_VID_MASK)
+		if (id >= VXLAN_N_VID)
 			return -ERANGE;
 	}