[linux] 23/29: drop bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch

[debian-kernel at lists.debian.org]

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

corsac pushed a commit to branch stretch
in repository linux.

commit 20f094ae7446e33f0544c4ae75a976fcab9edc75
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Thu Jan 18 11:52:05 2018 +0100

    drop bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch
---
 debian/changelog                                   |  7 ++--
 ...vent-stack-info-leak-from-the-efs-element.patch | 48 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12112b8..bdb6cc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -791,11 +791,10 @@ linux (4.9.77-1) UNRELEASED; urgency=medium
   * lib/genalloc: Avoid ABI change in 4.9.69.
   * Ignore ABI changes in inet_diag, SCTP, vsock, NVME, MD and libsas drivers,
     prevent FTBFS.
-  * debian/patches:
+  * debian/patches: drop patches included upstream:
     - bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch
-      dropped, included upstream.
-    - bugfix/all/kvm-fix-stack-out-of-bounds-read-in-write_mmio.patch dropped,
-      included upstream.
+    - bugfix/all/kvm-fix-stack-out-of-bounds-read-in-write_mmio.patch
+  	- bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 28 Dec 2017 02:16:23 +0000
 
diff --git a/debian/patches/bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch b/debian/patches/bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch
deleted file mode 100644
index d002a4e..0000000
--- a/debian/patches/bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Ben Seri <ben at armis.com>
-Date: Mon, 04 Dec 2017 14:13:25 +0000
-Subject: bluetooth: Prevent stack info leak from the EFS element.
-Origin: http://www.openwall.com/lists/oss-security/2017/12/06/3
-Bug-Debian: https://security-tracker.debian.org/tracker/CVE-2017-1000410
-
-Signed-off-by: Ben Seri <ben at armis.com>
----
---- a/net/bluetooth/l2cap_core.c
-+++ b/net/bluetooth/l2cap_core.c
-@@ -3353,9 +3353,10 @@ static int l2cap_parse_conf_req(struct l
- 			break;
- 
- 		case L2CAP_CONF_EFS:
--			remote_efs = 1;
--			if (olen == sizeof(efs))
-+			if (olen == sizeof(efs)) {
-+				remote_efs = 1;
- 				memcpy(&efs, (void *) val, olen);
-+			}
- 			break;
- 
- 		case L2CAP_CONF_EWS:
-@@ -3574,16 +3575,17 @@ static int l2cap_parse_conf_rsp(struct l
- 			break;
- 
- 		case L2CAP_CONF_EFS:
--			if (olen == sizeof(efs))
-+			if (olen == sizeof(efs)) {
- 				memcpy(&efs, (void *)val, olen);
- 
--			if (chan->local_stype != L2CAP_SERV_NOTRAFIC &&
--			    efs.stype != L2CAP_SERV_NOTRAFIC &&
--			    efs.stype != chan->local_stype)
--				return -ECONNREFUSED;
-+				if (chan->local_stype != L2CAP_SERV_NOTRAFIC &&
-+				    efs.stype != L2CAP_SERV_NOTRAFIC &&
-+				    efs.stype != chan->local_stype)
-+					return -ECONNREFUSED;
- 
--			l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS, sizeof(efs),
--					   (unsigned long) &efs, endptr - ptr);
-+				l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS, sizeof(efs),
-+						   (unsigned long) &efs, endptr - ptr);
-+			}
- 			break;
- 
- 		case L2CAP_CONF_FCS:
diff --git a/debian/patches/series b/debian/patches/series
index a727850..a378de5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -141,7 +141,6 @@ bugfix/all/media-dvb-usb-v2-lmedm04-move-ts2020-attach-to-dm04_.patch
 bugfix/all/media-hdpvr-fix-an-error-handling-path-in-hdpvr_prob.patch
 bugfix/all/netfilter-nfnetlink_cthelper-add-missing-permission-.patch
 bugfix/all/netfilter-xt_osf-add-missing-permission-checks.patch
-bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch
 
 # Fix exported symbol versions
 bugfix/ia64/revert-ia64-move-exports-to-definitions.patch

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