Skip to contentSkip to conversation

Patch "[media] media: entity: Fix stream count check" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jul 7, 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

[media] media: entity: Fix stream count check

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:
media-entity-fix-stream-count-check.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 41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f Mon Sep 17 00:00:00 2001

From: Sakari Ailus <[email protected]>
Date: Wed, 20 Jul 2016 08:32:49 -0300
Subject: [media] media: entity: Fix stream count check

From: Sakari Ailus <[email protected]>

commit 41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f upstream.

There's a sanity check for the stream count remaining positive or zero on error path, but instead of performing the check on the traversed entity it is performed on the entity where traversal ends. Fix this.

Fixes commit 3801bc7d1b8d ("[media] media: Media Controller fix to not let stream_count go negative")
---
 drivers/media/media-entity.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/media-entity.c +1 -1
@@ -468,7 +468,7 @@ error:
 
 	while ((entity_err = media_entity_graph_walk_next(graph))) {
 		/* don't let the stream_count go negative */
-		if (entity->stream_count > 0) {
+		if (entity_err->stream_count > 0) {
 			entity_err->stream_count--;
 			if (entity_err->stream_count == 0)
 				entity_err->pipe = NULL;

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

queue-4.9/media-entity-fix-stream-count-check.patch