diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2016-05-30 14:35:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2016-06-01 00:49:35 +0200 |
commit | 851c1f63c5ae4e2ccce9d2787cfd0625493b601d (patch) | |
tree | 2850b0ceb85613410d154d8b9442db85caf068bd | |
parent | 81559df244cce75b71d06d34eaf257fa8f7535c0 (diff) | |
download | meta-enea-dizzy-enea.tar.gz |
kernel-net-ppp: CVE-2015-8569dizzy-enea
Fixes an information leak from getsockname in the linux-yocto 3.14.
References:
===========
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8569
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2015-8569
Reference to the upstream fixes:
===============================
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/
patch/?id=0b21a04d1ff604297995fe4a21bde8ba7333d42c
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
-rw-r--r-- | recipes-kernel/linux/linux-yocto-3.14/net-ppp-CVE-2015-8569.patch | 46 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto_3.14.bbappend | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-yocto-3.14/net-ppp-CVE-2015-8569.patch b/recipes-kernel/linux/linux-yocto-3.14/net-ppp-CVE-2015-8569.patch new file mode 100644 index 0000000..de58a87 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-3.14/net-ppp-CVE-2015-8569.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 0b21a04d1ff604297995fe4a21bde8ba7333d42c Mon Sep 17 00:00:00 2001 | ||
2 | From: WANG Cong <xiyou.wangcong@gmail.com> | ||
3 | Date: Mon, 14 Dec 2015 13:48:36 -0800 | ||
4 | Subject: pptp: verify sockaddr_len in pptp_bind() and pptp_connect() | ||
5 | |||
6 | [ Upstream commit 09ccfd238e5a0e670d8178cf50180ea81ae09ae1 ] | ||
7 | |||
8 | CVE: CVE-2015-8569 | ||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Reported-by: Dmitry Vyukov <dvyukov@gmail.com> | ||
12 | Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> | ||
13 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
14 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
15 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
16 | --- | ||
17 | drivers/net/ppp/pptp.c | 6 ++++++ | ||
18 | 1 file changed, 6 insertions(+) | ||
19 | |||
20 | diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c | ||
21 | index 1dc628f..0710214 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 | -- | ||
45 | cgit v0.12 | ||
46 | |||
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend index bc3a24f..50bce16 100644 --- a/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -28,4 +28,5 @@ SRC_URI += "file://HID_CVE_patches/0005-HID-steelseries-validate-output-report-d | |||
28 | file://net-unix-CVE-2013-7446.patch \ | 28 | file://net-unix-CVE-2013-7446.patch \ |
29 | file://ALSA-CVE-2016-2546.patch \ | 29 | file://ALSA-CVE-2016-2546.patch \ |
30 | file://ALSA-CVE-2016-2384.patch \ | 30 | file://ALSA-CVE-2016-2384.patch \ |
31 | file://net-ppp-CVE-2015-8569.patch \ | ||
31 | " | 32 | " |