[linux] 04/05: pptp: verify sockaddr_len in pptp_bind() and pptp_connect() (CVE-2015-8569)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy-security
in repository linux.

commit 64a1c3ea18349ba249d2d615efbf9f2a31dce7ac
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Dec 27 14:26:50 2015 +0000

    pptp: verify sockaddr_len in pptp_bind() and pptp_connect() (CVE-2015-8569)
---
 debian/changelog                                   |  1 +
 ...-sockaddr_len-in-pptp_bind-and-pptp_conne.patch | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1b95e01..06f571b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ linux (3.2.73-2+deb7u2) UNRELEASED; urgency=medium
   * [xen] Fix race conditions in back-end drivers (CVE-2015-8550, XSA-155)
   * [xen] pciback: Fix state validation in MSI control operations
     (CVE-2015-8551, CVE-2015-8852, XSA-157)
+  * pptp: verify sockaddr_len in pptp_bind() and pptp_connect() (CVE-2015-8569)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 27 Dec 2015 19:23:43 +0000
 
diff --git a/debian/patches/bugfix/all/pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch b/debian/patches/bugfix/all/pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch
new file mode 100644
index 0000000..3c8b7bf
--- /dev/null
+++ b/debian/patches/bugfix/all/pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch
@@ -0,0 +1,34 @@
+From: WANG Cong <xiyou.wangcong at gmail.com>
+Date: Mon, 14 Dec 2015 13:48:36 -0800
+Subject: pptp: verify sockaddr_len in pptp_bind() and pptp_connect()
+Origin: https://git.kernel.org/linus/09ccfd238e5a0e670d8178cf50180ea81ae09ae1
+
+Reported-by: Dmitry Vyukov <dvyukov at gmail.com>
+Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/ppp/pptp.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/net/ppp/pptp.c
++++ b/drivers/net/ppp/pptp.c
+@@ -420,6 +420,9 @@ static int pptp_bind(struct socket *sock
+ 	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 *s
+ 	struct flowi4 fl4;
+ 	int error = 0;
+ 
++	if (sockaddr_len < sizeof(struct sockaddr_pppox))
++		return -EINVAL;
++
+ 	if (sp->sa_protocol != PX_PROTO_PPTP)
+ 		return -EINVAL;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 43d2b68..53860c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1182,3 +1182,4 @@ bugfix/all/xen-pciback-return-error-on-xen_pci_op_enable_msix-w.patch
 bugfix/all/xen-pciback-do-not-install-an-irq-handler-for-msi-in.patch
 bugfix/all/xen-pciback-for-xen_pci_op_disable_msi-x-only-disabl.patch
 bugfix/all/xen-pciback-don-t-allow-msi-x-ops-if-pci_command_mem.patch
+bugfix/all/pptp-verify-sockaddr_len-in-pptp_bind-and-pptp_conne.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git