[PATCH net] vxlan: correctly validate VXLAN ID against VXLAN_VID_MASK

Subsystems: networking drivers, the rest

STALE3471d

2 messages, 2 authors, 2017-02-23 · open the first message on its own page

[PATCH net] vxlan: correctly validate VXLAN ID against VXLAN_VID_MASK

From: Matthias Schiffer <hidden>
Date: 2017-02-23 13:14:48

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 <redacted>
---
 drivers/net/vxlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 556953f53437..f89428fb7389 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_VID_MASK)
 			return -ERANGE;
 	}
 
-- 
2.11.1

Re: [PATCH net] vxlan: correctly validate VXLAN ID against VXLAN_VID_MASK

From: Jiri Benc <hidden>
Date: 2017-02-23 15:34:41

On Thu, 23 Feb 2017 13:59:02 +0100, Matthias Schiffer wrote:
quoted hunk
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 <redacted>
---
 drivers/net/vxlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 556953f53437..f89428fb7389 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_VID_MASK)
 			return -ERANGE;
 	}
 
"if (id >= VXLAN_N_VID)" would be cleaner and the meaning more obvious.

Thanks,

 Jiri
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help