40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
|
From 16c5a158e97d5b1f6c8bf86b006c1349f025d4e0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: WANG Cong <xiyou.wangcong@gmail.com>
|
||
|
|
Date: Mon, 14 Dec 2015 13:48:36 -0800
|
||
|
|
Subject: [PATCH] pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
drivers/net/ppp/pptp.c | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
|
||
|
|
index fc69e41d0950..597c53e0a2ec 100644
|
||
|
|
--- a/drivers/net/ppp/pptp.c
|
||
|
|
+++ b/drivers/net/ppp/pptp.c
|
||
|
|
@@ -419,6 +419,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;
|
||
|
|
@@ -440,6 +443,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;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.5.0
|
||
|
|
|