From 81559df244cce75b71d06d34eaf257fa8f7535c0 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Mon, 30 May 2016 13:38:29 +0200 Subject: kernel-net-ppp: CVE-2015-8569 Fixes an information leak from getsockname in the linux-qoriq 3.12. 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=d470ffbe3fe914d176ced4cf330a297c523c5711 Signed-off-by: Sona Sarmadi Signed-off-by: Tudor Florea --- .../linux-qoriq-3.12/net-ppp-CVE-2015-8569.patch | 46 ++++++++++++++++++++++ recipes-kernel/linux/linux-qoriq-common.inc | 1 + 2 files changed, 47 insertions(+) create mode 100644 recipes-kernel/linux/linux-qoriq-3.12/net-ppp-CVE-2015-8569.patch diff --git a/recipes-kernel/linux/linux-qoriq-3.12/net-ppp-CVE-2015-8569.patch b/recipes-kernel/linux/linux-qoriq-3.12/net-ppp-CVE-2015-8569.patch new file mode 100644 index 0000000..2593ce6 --- /dev/null +++ b/recipes-kernel/linux/linux-qoriq-3.12/net-ppp-CVE-2015-8569.patch @@ -0,0 +1,46 @@ +From d470ffbe3fe914d176ced4cf330a297c523c5711 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: Jiri Slaby +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-qoriq-common.inc b/recipes-kernel/linux/linux-qoriq-common.inc index 53b7bfc..45cd13c 100644 --- a/recipes-kernel/linux/linux-qoriq-common.inc +++ b/recipes-kernel/linux/linux-qoriq-common.inc @@ -29,6 +29,7 @@ SRC_URI += "file://b4860-hard_irq_disable-bug.patch \ file://ALSA-CVE-2016-2546.patch \ file://ALSA-CVE-2016-2384.patch \ file://ipv4-CVE-2016-3156.patch \ + file://net-ppp-CVE-2015-8569.patch \ " SRC_URI += "file://cfg/00013-localversion.cfg \ -- cgit v1.2.3-54-g00ecf