From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932832AbdGJRNV (ORCPT ); Mon, 10 Jul 2017 13:13:21 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47336 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932771AbdGJRNR (ORCPT ); Mon, 10 Jul 2017 13:13:17 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sakari Ailus , Laurent Pinchart , Mauro Carvalho Chehab Subject: [PATCH 4.9 06/41] [media] media: entity: Fix stream count check Date: Mon, 10 Jul 2017 19:10:39 +0200 Message-Id: <20170710171052.119510545@linuxfoundation.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170710171051.866846041@linuxfoundation.org> References: <20170710171051.866846041@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ 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;