diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2015-12-14 13:48:36 -0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-01-15 18:41:51 -0500 |
| commit | 652ed6f6effe13ce2fc0215230517aa01bdbf3e3 (patch) | |
| tree | 4ad9fcf94d1243777ab5c5105ee0beeed233d69a | |
| parent | eb2c241e08e87ca7455da70608da5032b7f27423 (diff) | |
| download | lwn-652ed6f6effe13ce2fc0215230517aa01bdbf3e3.tar.gz lwn-652ed6f6effe13ce2fc0215230517aa01bdbf3e3.zip | |
pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
[ Upstream commit 09ccfd238e5a0e670d8178cf50180ea81ae09ae1 ]
Reported-by: Dmitry Vyukov <dvyukov@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/net/ppp/pptp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c index 1dc628ffce2b..0710214df2bf 100644 --- a/drivers/net/ppp/pptp.c +++ b/drivers/net/ppp/pptp.c @@ -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; |