From: Greg Kroah-Hartman Date: Thu, 4 Nov 2021 08:39:38 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.19.216~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=574cc474acd40bd58fbe89332e3af55f2b773a58;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: revert-drm-ttm-fix-memleak-in-ttm_transfered_destroy.patch --- diff --git a/queue-5.4/revert-drm-ttm-fix-memleak-in-ttm_transfered_destroy.patch b/queue-5.4/revert-drm-ttm-fix-memleak-in-ttm_transfered_destroy.patch new file mode 100644 index 00000000000..ef0d6ee9055 --- /dev/null +++ b/queue-5.4/revert-drm-ttm-fix-memleak-in-ttm_transfered_destroy.patch @@ -0,0 +1,43 @@ +From bfd043fac1e7eaa5b16b5368373593bf9cc92d12 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 4 Nov 2021 09:35:57 +0100 +Subject: Revert "drm/ttm: fix memleak in ttm_transfered_destroy" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Greg Kroah-Hartman + +This reverts commit bd99782f3ca491879e8524c89b1c0f40071903bd which is +commit 0db55f9a1bafbe3dac750ea669de9134922389b5 upstream. + +Seems that the older kernels can not handle this fix because, to quote +Christian: + The problem is this memory leak could potentially happen with + 5.10 as wel, just much much much less likely. + + But my guess is that 5.10 is so buggy that when the leak does + NOT happen we double free and obviously causing a crash. + +So it needs to be reverted. + +Link: https://lore.kernel.org/r/1a1cc125-9314-f569-a6c4-40fc4509a377@amd.com +Cc: Christian König +Cc: Erhard F. +Cc: Erhard F. +Cc: Huang Rui +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/gpu/drm/ttm/ttm_bo_util.c ++++ b/drivers/gpu/drm/ttm/ttm_bo_util.c +@@ -463,7 +463,6 @@ static void ttm_transfered_destroy(struc + struct ttm_transfer_obj *fbo; + + fbo = container_of(bo, struct ttm_transfer_obj, base); +- dma_resv_fini(&fbo->base.base._resv); + ttm_bo_put(fbo->bo); + kfree(fbo); + } diff --git a/queue-5.4/series b/queue-5.4/series index 1cf8ab41000..d9a13dc76b6 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -5,3 +5,4 @@ media-firewire-firedtv-avc-fix-a-buffer-overflow-in-avc_ca_pmt.patch revert-xhci-set-hcd-flag-to-defer-primary-roothub-registration.patch revert-usb-core-hcd-add-support-for-deferring-roothub.patch sfc-fix-reading-non-legacy-supported-link-modes.patch +revert-drm-ttm-fix-memleak-in-ttm_transfered_destroy.patch