netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net] vxlan: correctly validate VXLAN ID against VXLAN_VID_MASK
@ 2017-02-23 12:59 Matthias Schiffer
  2017-02-23 15:34 ` Jiri Benc
  0 siblings, 1 reply; 2+ messages in thread
From: Matthias Schiffer @ 2017-02-23 12:59 UTC (permalink / raw)
  To: davem, jbenc; +Cc: netdev

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net] vxlan: correctly validate VXLAN ID against VXLAN_VID_MASK
  2017-02-23 12:59 [PATCH net] vxlan: correctly validate VXLAN ID against VXLAN_VID_MASK Matthias Schiffer
@ 2017-02-23 15:34 ` Jiri Benc
  0 siblings, 0 replies; 2+ messages in thread
From: Jiri Benc @ 2017-02-23 15:34 UTC (permalink / raw)
  To: Matthias Schiffer; +Cc: davem, netdev

On Thu, 23 Feb 2017 13:59:02 +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>
> ---
>  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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-02-23 15:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-23 12:59 [PATCH net] vxlan: correctly validate VXLAN ID against VXLAN_VID_MASK Matthias Schiffer
2017-02-23 15:34 ` Jiri Benc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).