Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9be48dc authored by James Chapman's avatar James Chapman Committed by David S. Miller
Browse files

l2tp: don't overwrite source address in l2tp_ip_bind() 



Applications using L2TP/IP sockets want to be able to bind() an L2TP/IP
socket to set the local tunnel id while leaving the auto-assigned source
address alone. So if no source address is supplied, don't overwrite
the address already stored in the socket.

Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1f224ae

net/l2tp/l2tp_ip.c

+2 −1
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	    chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)

		goto out;



	if (addr->l2tp_addr.s_addr)

		inet->inet_rcv_saddr = inet->inet_saddr = addr->l2tp_addr.s_addr;

	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)

		inet->inet_saddr = 0;  /* Use device */