Blame pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch
|
 |
6cd517b |
From 16c5a158e97d5b1f6c8bf86b006c1349f025d4e0 Mon Sep 17 00:00:00 2001
|
|
|
6cd517b |
From: WANG Cong <xiyou.wangcong@gmail.com>
|
|
|
6cd517b |
Date: Mon, 14 Dec 2015 13:48:36 -0800
|
|
|
6cd517b |
Subject: [PATCH] pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
|
|
|
6cd517b |
|
|
|
6cd517b |
Reported-by: Dmitry Vyukov <dvyukov@gmail.com>
|
|
|
6cd517b |
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
|
|
|
6cd517b |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
6cd517b |
---
|
|
|
6cd517b |
drivers/net/ppp/pptp.c | 6 ++++++
|
|
|
6cd517b |
1 file changed, 6 insertions(+)
|
|
|
6cd517b |
|
|
|
6cd517b |
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
|
|
|
6cd517b |
index fc69e41d0950..597c53e0a2ec 100644
|
|
|
6cd517b |
--- a/drivers/net/ppp/pptp.c
|
|
|
6cd517b |
+++ b/drivers/net/ppp/pptp.c
|
|
|
6cd517b |
@@ -419,6 +419,9 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
|
|
|
6cd517b |
struct pptp_opt *opt = &po->proto.pptp;
|
|
|
6cd517b |
int error = 0;
|
|
|
6cd517b |
|
|
|
6cd517b |
+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
|
|
|
6cd517b |
+ return -EINVAL;
|
|
|
6cd517b |
+
|
|
|
6cd517b |
lock_sock(sk);
|
|
|
6cd517b |
|
|
|
6cd517b |
opt->src_addr = sp->sa_addr.pptp;
|
|
|
6cd517b |
@@ -440,6 +443,9 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
|
|
|
6cd517b |
struct flowi4 fl4;
|
|
|
6cd517b |
int error = 0;
|
|
|
6cd517b |
|
|
|
6cd517b |
+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
|
|
|
6cd517b |
+ return -EINVAL;
|
|
|
6cd517b |
+
|
|
|
6cd517b |
if (sp->sa_protocol != PX_PROTO_PPTP)
|
|
|
6cd517b |
return -EINVAL;
|
|
|
6cd517b |
|
|
|
6cd517b |
--
|
|
|
6cd517b |
2.5.0
|
|
|
6cd517b |
|