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

Commit 652ed6f6 authored by WANG Cong's avatar WANG Cong Committed by Sasha Levin
Browse files

pptp: verify sockaddr_len in pptp_bind() and pptp_connect() 



[ Upstream commit 09ccfd238e5a0e670d8178cf50180ea81ae09ae1 ]

Reported-by: default avatarDmitry Vyukov <dvyukov@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent eb2c241e

drivers/net/ppp/pptp.c

+6 −0
Original line number Diff line number Diff line
@@ -420,6 +420,9 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr, 
	struct pptp_opt *opt = &po->proto.pptp;

	int error = 0;



	if (sockaddr_len < sizeof(struct sockaddr_pppox))

		return -EINVAL;



	lock_sock(sk);



	opt->src_addr = sp->sa_addr.pptp;
@@ -441,6 +444,9 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, 
	struct flowi4 fl4;

	int error = 0;



	if (sockaddr_len < sizeof(struct sockaddr_pppox))

		return -EINVAL;



	if (sp->sa_protocol != PX_PROTO_PPTP)

		return -EINVAL;