public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 08:44:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

l2tp: unmanaged L2TPv3 tunnels fixes

Browse source 
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>
This commit is contained in:
Eric Dumazet 2010-04-04 01:02:46 -07:00 • committed by David S. Miller
parent 486f50ca79
commit 7bddd0db62
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/l2tp/l2tp_core.c
View file

@ -1227,7 +1227,7 @@ static int l2tp_tunnel_sock_create(u32 tunnel_id, u32 peer_tunnel_id, struct l2t
int err = -EINVAL; int err = -EINVAL;
struct sockaddr_in udp_addr; struct sockaddr_in udp_addr;
struct sockaddr_l2tpip ip_addr; struct sockaddr_l2tpip ip_addr;
struct socket *sock; struct socket *sock = NULL;
switch (cfg->encap) { switch (cfg->encap) {
case L2TP_ENCAPTYPE_UDP: case L2TP_ENCAPTYPE_UDP:

2
net/l2tp/l2tp_core.h
View file

@ -152,7 +152,7 @@ struct l2tp_tunnel_cfg {
struct in_addr peer_ip; struct in_addr peer_ip;
u16 local_udp_port; u16 local_udp_port;
u16 peer_udp_port; u16 peer_udp_port;
int use_udp_checksums:1; unsigned int use_udp_checksums:1;
}; };
struct l2tp_tunnel { struct l2tp_tunnel {