diff mbox

[net,v2] vxlan: correctly validate VXLAN ID against VXLAN_N_VID

Message ID 4650647d72b8f219cb725b40de9b4627f3306919.1487866739.git.mschiffer@universe-factory.net
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Matthias Schiffer Feb. 23, 2017, 4:19 p.m. UTC
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>
---
v2: check against VXLAN_N_VID instead of changing operator


 drivers/net/vxlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jiri Benc Feb. 23, 2017, 4:26 p.m. UTC | #1
On Thu, 23 Feb 2017 17:19:41 +0100, Matthias Schiffer wrote:
> 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>
> ---
> v2: check against VXLAN_N_VID instead of changing operator

Acked-by: Jiri Benc <jbenc@redhat.com>

Thanks!

 Jiri
David Miller Feb. 24, 2017, 4:20 p.m. UTC | #2
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 23 Feb 2017 17:19:41 +0100

> 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>

Applied and queued up for -stable, thanks.
diff mbox

Patch

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 556953f53437..268c2a12e61d 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2675,7 +2675,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;
 	}