TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

erspan: Check IFLA_GRE_ERSPAN_VER is set.

Browse Source 
commit 51fa960d3b5163b1af22efdebcabfccc5d615ad6 upstream.

Add a check to make sure the IFLA_GRE_ERSPAN_VER is provided by users.

Fixes: f989d546a2d5 ("erspan: Add type I version 0 support.")
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: William Tu <u9012063@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
William Tu
2020-05-12 10:36:23 -07:00
committed by Greg Kroah-Hartman
parent cc065e1b11
commit 584661cc24
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/ip_gre.c
View File

@@ -1182,7 +1182,8 @@ static int erspan_validate(struct nlattr *tb[], struct nlattr *data[],
if (ret) if (ret)
return ret; return ret;
if (nla_get_u8(data[IFLA_GRE_ERSPAN_VER]) == 0) if (data[IFLA_GRE_ERSPAN_VER] &&
nla_get_u8(data[IFLA_GRE_ERSPAN_VER]) == 0)
return 0; return 0;
/* ERSPAN type II/III should only have GRE sequence and key flag */ /* ERSPAN type II/III should only have GRE sequence and key flag */