This is a note to let you know that I've just added the patch titled
drm/radeon/vm: don't attempt to update ptes if ib allocation fails
to the 3.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-vm-don-t-attempt-to-update-ptes-if-ib-allocation-fails.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4cc948b94a222c310ae089c36718aac7a03aec90 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Wed, 13 Nov 2013 15:25:35 -0500
Subject: drm/radeon/vm: don't attempt to update ptes if ib allocation fails
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 4cc948b94a222c310ae089c36718aac7a03aec90 upstream.
If we fail to allocate an indirect buffer (ib) when updating
the ptes, return an error instead of trying to use the ib.
Avoids a null pointer dereference.
Bug:
https://bugzilla.kernel.org/show_bug.cgi?id=58621
v2 (chk): rebased on drm-fixes-3.12 for stable inclusion
Reviewed-by: Christian König <christian.koenig@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/radeon_gart.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -1156,6 +1156,8 @@ int radeon_vm_bo_update_pte(struct radeo
return -ENOMEM;
r = radeon_ib_get(rdev, ridx, &ib, NULL, ndw * 4);
+ if (r)
+ return r;
ib.length_dw = 0;
r = radeon_vm_update_pdes(rdev, vm, &ib, bo_va->soffset, bo_va->eoffset);
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.12/drm-radeon-hook-up-backlight-functions-for-ci-and-kv-family.patch
queue-3.12/drm-radeon-fix-uvd-destroy-ib-size.patch
queue-3.12/drm-radeon-si-fix-define-for-mc_seq_train_wakeup_cntl.patch
queue-3.12/drm-radeon-vm-don-t-attempt-to-update-ptes-if-ib-allocation-fails.patch
queue-3.12/drm-radeon-don-t-share-pplls-on-dce4.1.patch
queue-3.12/radeon-i2c-do-not-count-reg-index-in-number-of-i2c-byte-we-are-writing.patch
queue-3.12/drm-radeon-activate-uvd-clocks-before-sending-the-destroy-msg.patch
queue-3.12/drm-radeon-adjust-tn-dpm-parameters-for-stability-v2.patch
queue-3.12/radeon-workaround-pinning-failure-on-low-ram-gpu.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html