3.17-stable patches

added patches:
	drm-radeon-initialize-sadb-to-null-in-the-audio-code.patch

diff --git a/queue-3.17/drm-radeon-initialize-sadb-to-null-in-the-audio-code.patch b/queue-3.17/drm-radeon-initialize-sadb-to-null-in-the-audio-code.patch
new file mode 100644 (file)
index 0000000..de44e66
--- /dev/null
+++ b/queue-3.17/drm-radeon-initialize-sadb-to-null-in-the-audio-code.patch
@@ -0,0 +1,53 @@
+From 83d04c39f9048807a8500e575ae3f1718a3f45bb Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Mon, 13 Oct 2014 13:23:48 -0400
+Subject: drm/radeon: initialize sadb to NULL in the audio code
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 83d04c39f9048807a8500e575ae3f1718a3f45bb upstream.
+
+Fixes kfree of the sadb buffer when it's NULL.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/dce3_1_afmt.c    |    2 +-
+ drivers/gpu/drm/radeon/dce6_afmt.c      |    2 +-
+ drivers/gpu/drm/radeon/evergreen_hdmi.c |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/dce3_1_afmt.c
++++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c
+@@ -32,7 +32,7 @@ static void dce3_2_afmt_write_speaker_al
+       struct drm_connector *connector;
+       struct radeon_connector *radeon_connector = NULL;
+       u32 tmp;
+-      u8 *sadb;
++      u8 *sadb = NULL;
+       int sad_count;
+ 
+       list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
+--- a/drivers/gpu/drm/radeon/dce6_afmt.c
++++ b/drivers/gpu/drm/radeon/dce6_afmt.c
+@@ -155,7 +155,7 @@ void dce6_afmt_write_speaker_allocation(
+       struct drm_connector *connector;
+       struct radeon_connector *radeon_connector = NULL;
+       u32 offset, tmp;
+-      u8 *sadb;
++      u8 *sadb = NULL;
+       int sad_count;
+ 
+       if (!dig || !dig->afmt || !dig->afmt->pin)
+--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
++++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
+@@ -102,7 +102,7 @@ static void dce4_afmt_write_speaker_allo
+       struct drm_connector *connector;
+       struct radeon_connector *radeon_connector = NULL;
+       u32 tmp;
+-      u8 *sadb;
++      u8 *sadb = NULL;
+       int sad_count;
+ 
+       list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {

diff --git a/queue-3.17/series b/queue-3.17/series
index 166c5e60fb3786c29c39b628da2513cb023ae4c7..821fa3667d2b68af1d28735239574ee4336d0910 100644 (file)
--- a/queue-3.17/series
+++ b/queue-3.17/series
@@ -111,3 +111,4 @@ drm-i915-kick-fbdev-before-vgacon.patch
 drm-i915-ignore-surflive-and-flip-counter-when-the-gpu-gets-reset.patch
 drm-radeon-report-disconnected-for-lvds-edp-with-px-if-ddc-fails.patch
 gpu-radeon-set-flag-to-indicate-broken-64-bit-msi.patch
+drm-radeon-initialize-sadb-to-null-in-the-audio-code.patch