aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp/l2tp_core.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-04-04 01:02:46 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-04 01:02:46 -0700
commit7bddd0db6248d92adb1f547fd45507af4368d6fa (patch)
tree4f182b3e880f597f9ee4cb48189da6b4f19b8003 /net/l2tp/l2tp_core.c
parentSCTP: Change to use ipv6_addr_copy() (diff)
downloadlinux-dev-7bddd0db6248d92adb1f547fd45507af4368d6fa.tar.xz
linux-dev-7bddd0db6248d92adb1f547fd45507af4368d6fa.zip
l2tp: unmanaged L2TPv3 tunnels fixes
Followup to commit 789a4a2c (l2tp: Add support for static unmanaged L2TPv3 tunnels) One missing init in l2tp_tunnel_sock_create() could access random kernel memory, and a bit field should be unsigned. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_core.c')
-rw-r--r--net/l2tp/l2tp_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 13ed85baf4e9..98dfcce1a5fc 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1227,7 +1227,7 @@ static int l2tp_tunnel_sock_create(u32 tunnel_id, u32 peer_tunnel_id, struct l2t
int err = -EINVAL;
struct sockaddr_in udp_addr;
struct sockaddr_l2tpip ip_addr;
- struct socket *sock;
+ struct socket *sock = NULL;
switch (cfg->encap) {
case L2TP_ENCAPTYPE_UDP: