Skip to contentSkip to conversation

Patch "ALSA: seq: Fix nested rwsem annotation for lockdep splat" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Nov 5, 2017

Subsystems (2)
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

ALSA: seq: Fix nested rwsem annotation for lockdep splat

to the 4.9-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:
alsa-seq-fix-nested-rwsem-annotation-for-lockdep-splat.patch
and it can be found in the queue-4.9 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 1f20f9ff57ca23b9f5502fca85ce3977e8496cb1 Mon Sep 17 00:00:00 2001

From: Takashi Iwai <[email protected]>
Date: Sun, 29 Oct 2017 11:10:43 +0100
Subject: ALSA: seq: Fix nested rwsem annotation for lockdep splat

From: Takashi Iwai <[email protected]>

commit 1f20f9ff57ca23b9f5502fca85ce3977e8496cb1 upstream.

syzkaller reported the lockdep splat due to the possible deadlock of grp->list_mutex of each sequencer client object. Actually this is rather a false-positive report due to the missing nested lock annotations. The sequencer client may deliver the event directly to another client which takes another own lock.

For addressing this issue, this patch replaces the simple down_read() with down_read_nested(). As a lock subclass, the already existing "hop" can be re-used, which indicates the depth of the call.

Reference: http://lkml.kernel.org/r/[email protected]

---
 sound/core/seq/seq_clientmgr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/seq/seq_clientmgr.c +1 -1
@@ -663,7 +663,7 @@ static int deliver_to_subscribers(struct
 	if (atomic)
 		read_lock(&grp->list_lock);
 	else
-		down_read(&grp->list_mutex);
+		down_read_nested(&grp->list_mutex, hop);
 	list_for_each_entry(subs, &grp->list_head, src_list) {
 		/* both ports ready? */
 		if (atomic_read(&subs->ref_count) != 2)

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

queue-4.9/alsa-seq-fix-nested-rwsem-annotation-for-lockdep-splat.patch queue-4.9/alsa-timer-add-missing-mutex-lock-for-compat-ioctls.patch