summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorSusant Sahani <susant@redhat.com>2014-05-10 00:11:32 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-30 21:52:16 -0700
commit4cba246ac61971484e454ee16efabb51e7452572 (patch)
tree816dc72ca923e6c91e43bd2c601636d064c4968f /net/ipv6
parent8b64afaca4d6cb80d0d1b2a4651b1efb7231f220 (diff)
downloadlinux-3.10-4cba246ac61971484e454ee16efabb51e7452572.tar.gz
linux-3.10-4cba246ac61971484e454ee16efabb51e7452572.tar.bz2
linux-3.10-4cba246ac61971484e454ee16efabb51e7452572.zip
ip6_tunnel: fix potential NULL pointer dereference
[ Upstream commit c8965932a2e3b70197ec02c6741c29460279e2a8 ] The function ip6_tnl_validate assumes that the rtnl attribute IFLA_IPTUN_PROTO always be filled . If this attribute is not filled by the userspace application kernel get crashed with NULL pointer dereference. This patch fixes the potential kernel crash when IFLA_IPTUN_PROTO is missing . Signed-off-by: Susant Sahani <susant@redhat.com> Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6_tunnel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index f21cf476b00..73d7f68da55 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1531,7 +1531,7 @@ static int ip6_tnl_validate(struct nlattr *tb[], struct nlattr *data[])
{
u8 proto;
- if (!data)
+ if (!data || !data[IFLA_IPTUN_PROTO])
return 0;
proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);