From 851c1f63c5ae4e2ccce9d2787cfd0625493b601d Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Mon, 30 May 2016 14:35:41 +0200 Subject: kernel-net-ppp: CVE-2015-8569 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 Signed-off-by: Tudor Florea --- .../linux-yocto-3.14/net-ppp-CVE-2015-8569.patch | 46 ++++++++++++++++++++++ recipes-kernel/linux/linux-yocto_3.14.bbappend | 1 + 2 files changed, 47 insertions(+) create mode 100644 recipes-kernel/linux/linux-yocto-3.14/net-ppp-CVE-2015-8569.patch 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 @@ +From 0b21a04d1ff604297995fe4a21bde8ba7333d42c Mon Sep 17 00:00:00 2001 +From: WANG Cong +Date: Mon, 14 Dec 2015 13:48:36 -0800 +Subject: pptp: verify sockaddr_len in pptp_bind() and pptp_connect() + +[ Upstream commit 09ccfd238e5a0e670d8178cf50180ea81ae09ae1 ] + +CVE: CVE-2015-8569 +Upstream-Status: Backport + +Reported-by: Dmitry Vyukov +Signed-off-by: Cong Wang +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sona Sarmadi +--- + 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 1dc628f..0710214 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; + +-- +cgit v0.12 + 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 file://net-unix-CVE-2013-7446.patch \ file://ALSA-CVE-2016-2546.patch \ file://ALSA-CVE-2016-2384.patch \ + file://net-ppp-CVE-2015-8569.patch \ " -- cgit v1.2.3-54-g00ecf