Skip to contentSkip to conversation

Patch "drm/nouveau: hold mutex when calling nouveau_abi16_fini()" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Aug 8, 2015

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/nouveau: hold mutex when calling nouveau_abi16_fini()

to the 4.1-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-nouveau-hold-mutex-when-calling-nouveau_abi16_fini.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ac8c79304280da6ef05c348a9da03ab04898b994 Mon Sep 17 00:00:00 2001

From: Kamil Dudka <[email protected]>
Date: Wed, 15 Jul 2015 17:18:15 +0200
Subject: drm/nouveau: hold mutex when calling nouveau_abi16_fini()

From: Kamil Dudka <[email protected]>

commit ac8c79304280da6ef05c348a9da03ab04898b994 upstream.

This was the only access to cli->abi16 without holding the mutex.

---
 drivers/gpu/drm/nouveau/nouveau_drm.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/nouveau/nouveau_drm.c +2 -0
@@ -863,8 +863,10 @@ nouveau_drm_preclose(struct drm_device *
 
 	pm_runtime_get_sync(dev->dev);
 
+	mutex_lock(&cli->mutex);
 	if (cli->abi16)
 		nouveau_abi16_fini(cli->abi16);
+	mutex_unlock(&cli->mutex);
 
 	mutex_lock(&drm->client.mutex);
 	list_del(&cli->head);

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/drm-nouveau-drm-nv04-nv40-instmem-protect-access-to-priv-heap-by-mutex.patch queue-4.1/drm-nouveau-hold-mutex-when-calling-nouveau_abi16_fini.patch