summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Tu <u9012063@gmail.com>2020-05-12 10:36:23 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-13 12:50:17 +0200
commit584661cc24d740bc0d68b605e7089d80a99bba9d (patch)
tree0c67f78a78fdeafc39b81898e4edcb548fbd203c
parentcc065e1b11a270ebd2b18bbe61f0d6cc8efaa15d (diff)
downloadlinux-stable-584661cc24d740bc0d68b605e7089d80a99bba9d.tar.gz
linux-stable-584661cc24d740bc0d68b605e7089d80a99bba9d.tar.bz2
linux-stable-584661cc24d740bc0d68b605e7089d80a99bba9d.zip
erspan: Check IFLA_GRE_ERSPAN_VER is set.
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>
-rw-r--r--net/ipv4/ip_gre.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 6d4b6815aa34..086474b09db0 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1182,7 +1182,8 @@ static int erspan_validate(struct nlattr *tb[], struct nlattr *data[],
if (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;
/* ERSPAN type II/III should only have GRE sequence and key flag */