Attachment 90196 Details for Bug 72283 – possible fix

[patch] possible fix

0001-drm-radeon-fix-null-pointer-dereference-in-dce6-audi.patch (text/plain), 2.03 KB, created by Alex Deucher on 2013-12-03 22:47:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-12-03 22:47:25 UTC

Size: 2.03 KB

patch

obsolete

>From b77b044c90bba7bba946036612766d60f71d3dfe Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Tue, 3 Dec 2013 17:45:14 -0500
>Subject: [PATCH] drm/radeon: fix null pointer dereference in dce6+ audio code
>
>Don't crash if the encoder does not have an afmt struct.
>
>bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=72283
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/dce6_afmt.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c
>index 009f46e..de86493 100644
>--- a/drivers/gpu/drm/radeon/dce6_afmt.c
>+++ b/drivers/gpu/drm/radeon/dce6_afmt.c
>@@ -93,11 +93,13 @@ void dce6_afmt_select_pin(struct drm_encoder *encoder)
> 	struct radeon_device *rdev = encoder->dev->dev_private;
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>-	u32 offset = dig->afmt->offset;
>+	u32 offset;
> 
>-	if (!dig->afmt->pin)
>+	if (!dig || !dig->afmt || !dig->afmt->pin)
> 		return;
> 
>+	offset = dig->afmt->offset;
>+
> 	WREG32(AFMT_AUDIO_SRC_CONTROL + offset,
> 	       AFMT_AUDIO_SRC_SELECT(dig->afmt->pin->id));
> }
>@@ -112,7 +114,7 @@ void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
> 	struct radeon_connector *radeon_connector = NULL;
> 	u32 tmp = 0, offset;
> 
>-	if (!dig->afmt->pin)
>+	if (!dig || !dig->afmt || !dig->afmt->pin)
> 		return;
> 
> 	offset = dig->afmt->pin->offset;
>@@ -156,7 +158,7 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder)
> 	u8 *sadb;
> 	int sad_count;
> 
>-	if (!dig->afmt->pin)
>+	if (!dig || !dig->afmt || !dig->afmt->pin)
> 		return;
> 
> 	offset = dig->afmt->pin->offset;
>@@ -217,7 +219,7 @@ void dce6_afmt_write_sad_regs(struct drm_encoder *encoder)
> 		{ AZ_F0_CODEC_PIN_CONTROL_AUDIO_DESCRIPTOR13, HDMI_AUDIO_CODING_TYPE_WMA_PRO },
> 	};
> 
>-	if (!dig->afmt->pin)
>+	if (!dig || !dig->afmt || !dig->afmt->pin)
> 		return;
> 
> 	offset = dig->afmt->pin->offset;
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 72283: 90196 | 90534 | 90535 | 90699 | 90700 | 90723 | 90731 | 90732 | 90735 | 90736 | 90737 | 90739

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.