From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Mon, 14 Dec 2015 21:48:36 +0000 (-0800)
Subject: pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
X-Git-Tag: v4.1.12-92~201^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e65fc75ca7028e5507ebbf0739fea853f225e64c;p=users%2Fjedix%2Flinux-maple.git

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

Orabug: 22641753

[ 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f167b6f4244fbc8d05fcc385b1bf8e70729c9e7c)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index e3bfbd4d0136..0bacabfa486e 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;