From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:44154 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751659AbdGGJvH (ORCPT ); Fri, 7 Jul 2017 05:51:07 -0400 Subject: Patch "[media] media: entity: Fix stream count check" has been added to the 4.9-stable tree To: sakari.ailus@linux.intel.com, gregkh@linuxfoundation.org, laurent.pinchart@ideasonboard.com, mchehab@s-opensource.com Cc: , From: Date: Fri, 07 Jul 2017 11:51:02 +0200 Message-ID: <1499421062239170@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Wed, 20 Jul 2016 08:32:49 -0300 Subject: [media] media: entity: Fix stream count check From: Sakari Ailus 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") Signed-off-by: Sakari Ailus Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/media-entity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -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 sakari.ailus@linux.intel.com are queue-4.9/media-entity-fix-stream-count-check.patch