summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-hierofalcon/net-ppp-CVE-2015-8569.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-hierofalcon/net-ppp-CVE-2015-8569.patch')
-rw-r--r--recipes-kernel/linux/linux-hierofalcon/net-ppp-CVE-2015-8569.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-hierofalcon/net-ppp-CVE-2015-8569.patch b/recipes-kernel/linux/linux-hierofalcon/net-ppp-CVE-2015-8569.patch
new file mode 100644
index 0000000..0efaa09
--- /dev/null
+++ b/recipes-kernel/linux/linux-hierofalcon/net-ppp-CVE-2015-8569.patch
@@ -0,0 +1,46 @@
1From f167b6f4244fbc8d05fcc385b1bf8e70729c9e7c Mon Sep 17 00:00:00 2001
2From: WANG Cong <xiyou.wangcong@gmail.com>
3Date: Mon, 14 Dec 2015 13:48:36 -0800
4Subject: pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
5
6[ Upstream commit 09ccfd238e5a0e670d8178cf50180ea81ae09ae1 ]
7
8CVE: CVE-2015-8569
9Upstream-Status: Backport
10
11Reported-by: Dmitry Vyukov <dvyukov@gmail.com>
12Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
13Signed-off-by: David S. Miller <davem@davemloft.net>
14Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
15Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
16---
17 drivers/net/ppp/pptp.c | 6 ++++++
18 1 file changed, 6 insertions(+)
19
20diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
21index e3bfbd4d..0bacabf 100644
22--- a/drivers/net/ppp/pptp.c
23+++ b/drivers/net/ppp/pptp.c
24@@ -420,6 +420,9 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
25 struct pptp_opt *opt = &po->proto.pptp;
26 int error = 0;
27
28+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
29+ return -EINVAL;
30+
31 lock_sock(sk);
32
33 opt->src_addr = sp->sa_addr.pptp;
34@@ -441,6 +444,9 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
35 struct flowi4 fl4;
36 int error = 0;
37
38+ if (sockaddr_len < sizeof(struct sockaddr_pppox))
39+ return -EINVAL;
40+
41 if (sp->sa_protocol != PX_PROTO_PPTP)
42 return -EINVAL;
43
44--
45cgit v0.12
46