Linux v4.19.3

5 files changed, 5 insertions, 159 deletions

diff --git a/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch b/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
deleted file mode 100644
index 2888fb6de..000000000
--- a/CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From patchwork Thu Sep 27 20:57:30 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [CI, 1/6] drm/i915/dp: Fix link retraining comment in
- intel_dp_long_pulse()
-From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-X-Patchwork-Id: 253516
-Message-Id: <20180927205735.16651-1-dhinakaran.pandiyan@intel.com>
-To: intel-gfx@lists.freedesktop.org
-Date: Thu, 27 Sep 2018 13:57:30 -0700
-
-Comment claims link needs to be retrained because the connected sink raised
-a long pulse to indicate link loss. If the sink did so,
-intel_dp_hotplug() would have handled link retraining. Looking at the
-logs in Bugzilla referenced in commit '3cf71bc9904d ("drm/i915: Re-apply
-Perform link quality check, unconditionally during long pulse"")', the
-issue is that the sink does not trigger an interrupt. What we want is
-->detect() from user space to check link status and retrain. Ville's
-review for the original patch also indicates the same root cause. So,
-rewrite the comment.
-
-v2: Patch split and rewrote comment.
-
-Cc: Lyude Paul <lyude@redhat.com>
-Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Cc: Jani Nikula <jani.nikula@linux.intel.com>
-Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
-Cc: Jan-Marek Glogowski <glogow@fbihome.de>
-References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")
-Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
----
- drivers/gpu/drm/i915/intel_dp.c | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 256a71c8c093..207b3ea2ed1a 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -5074,16 +5074,9 @@ intel_dp_long_pulse(struct intel_connector *connector,
- 		goto out;
- 	} else {
- 		/*
--		 * If display is now connected check links status,
--		 * there has been known issues of link loss triggering
--		 * long pulse.
--		 *
--		 * Some sinks (eg. ASUS PB287Q) seem to perform some
--		 * weird HPD ping pong during modesets. So we can apparently
--		 * end up with HPD going low during a modeset, and then
--		 * going back up soon after. And once that happens we must
--		 * retrain the link to get a picture. That's in case no
--		 * userspace component reacted to intermittent HPD dip.
-+		 * Some external monitors do not signal loss of link
-+		 * synchronization with an IRQ_HPD, so force a link status
-+		 * check.
- 		 */
- 		struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- 
diff --git a/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch b/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
deleted file mode 100644
index bb9106d05..000000000
--- a/CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From patchwork Thu Sep 27 20:57:31 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [CI, 2/6] drm/i915/dp: Restrict link retrain workaround to external
- monitors
-From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-X-Patchwork-Id: 253514
-Message-Id: <20180927205735.16651-2-dhinakaran.pandiyan@intel.com>
-To: intel-gfx@lists.freedesktop.org
-Date: Thu, 27 Sep 2018 13:57:31 -0700
-
-Commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check,
-unconditionally during long pulse"")' applies a work around for sinks
-that don't signal link loss. The work around does not need to have to be
-that broad as the issue was seen with only one particular monitor; limit
-this only for external displays as eDP features like PSR turn off the link
-and the driver ends up retraining the link seeeing that link is not
-synchronized.
-
-Cc: Lyude Paul <lyude@redhat.com>
-Cc: Jan-Marek Glogowski <glogow@fbihome.de>
-Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
-References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")
-Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
----
- drivers/gpu/drm/i915/intel_dp.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 207b3ea2ed1a..4e0870f3a4a5 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -5072,12 +5072,13 @@ intel_dp_long_pulse(struct intel_connector *connector,
- 		 */
- 		status = connector_status_disconnected;
- 		goto out;
--	} else {
--		/*
--		 * Some external monitors do not signal loss of link
--		 * synchronization with an IRQ_HPD, so force a link status
--		 * check.
--		 */
-+	}
-+
-+	/*
-+	 * Some external monitors do not signal loss of link synchronization
-+	 * with an IRQ_HPD, so force a link status check.
-+	 */
-+	if (!intel_dp_is_edp(intel_dp)) {
- 		struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
- 
- 		intel_dp_retrain_link(encoder, ctx);
diff --git a/cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch b/cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch
deleted file mode 100644
index ea594f4a6..000000000
--- a/cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e4f3aa2e1e67bb48dfbaaf1cad59013d5a5bc276 Mon Sep 17 00:00:00 2001
-From: Young_X <YangX92@hotmail.com>
-Date: Wed, 3 Oct 2018 12:54:29 +0000
-Subject: cdrom: fix improper type cast, which can leat to information leak.
-
-From: Young_X <YangX92@hotmail.com>
-
-commit e4f3aa2e1e67bb48dfbaaf1cad59013d5a5bc276 upstream.
-
-There is another cast from unsigned long to int which causes
-a bounds check to fail with specially crafted input. The value is
-then used as an index in the slot array in cdrom_slot_status().
-
-This issue is similar to CVE-2018-16658 and CVE-2018-10940.
-
-Signed-off-by: Young_X <YangX92@hotmail.com>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/cdrom/cdrom.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/cdrom/cdrom.c
-+++ b/drivers/cdrom/cdrom.c
-@@ -2445,7 +2445,7 @@ static int cdrom_ioctl_select_disc(struc
- 		return -ENOSYS;
- 
- 	if (arg != CDSL_CURRENT && arg != CDSL_NONE) {
--		if ((int)arg >= cdi->capacity)
-+		if (arg >= cdi->capacity)
- 			return -EINVAL;
- 	}
- 
diff --git a/kernel.spec b/kernel.spec
index f14832391..4e55f325f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -618,13 +618,6 @@ Patch501: Fix-for-module-sig-verification.patch
 # rhbz 1431375
 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 
-# Fix known regression
-Patch504: CI-1-6-drm-i915-dp-Fix-link-retraining-comment-in-intel_dp_long_pulse.patch
-Patch505: CI-2-6-drm-i915-dp-Restrict-link-retrain-workaround-to-external-monitors.patch
-
-# CVE-2018-18710 rhbz 1645140 1648485
-Patch506: cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch
-
 # rhbz 1526312, patch is in 4.20, can be dropped on rebase
 Patch507: 0001-HID-i2c-hid-override-HID-descriptors-for-certain-dev.patch
 
@@ -1885,6 +1878,9 @@ fi
 #
 #
 %changelog
+* Wed Nov 21 2018 Jeremy Cline <jcline@redhat.com> - 4.19.3-300
+- Linux v4.19.3
+
 * Tue Nov 20 2018 Hans de Goede <hdegoede@redhat.com>
 - Turn on CONFIG_PINCTRL_GEMINILAKE on x86_64 (rhbz#1639155)
 - Add a patch fixing touchscreens on HP AMD based laptops (rhbz#1644013)
diff --git a/sources b/sources
index 0bf74a261..100856cfc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
-SHA512 (patch-4.19.2.xz) = d2e5fccf6fa63f903290cc976716d13c545f18aa3a18196ceaca1bd83b80307951fd6692437ea99cb5d91a10b0f395b343061c248544665e6a8767c895d68e29
+SHA512 (patch-4.19.3.xz) = e82e997423581388fb3149fcae1e591e04eb3060416f9f8ef3dcfffd4833f2b2ca617fdd79a92c610c6a34440e63a1f5d92dee429fb14d963ec98542552db4fa