From patchwork Tue Oct 27 13:54:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 289895 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CD58C55178 for ; Tue, 27 Oct 2020 14:55:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BFF0722281 for ; Tue, 27 Oct 2020 14:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810511; bh=6EsG4J3qaTfb+6PTdylTCV8RwtHyBqmGpqFKCjSOQ5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z7j1he3UkXFFam1a+INXOpJqfxO7pNrORHsIc7bktbq1JazddeeCpdyd3hW+Oeinr bEZ7Cheo5bvhRm+di19yrcy1FN06RPfKOXLAWFa5o1j3zQCgkRgcjVnGSon8HI5XDN oIWKtb9+5uLP5JKs6BJly5jLv4ZOQdXzIuPpFDkE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1780424AbgJ0Oyn (ORCPT ); Tue, 27 Oct 2020 10:54:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:43460 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762612AbgJ0Onj (ORCPT ); Tue, 27 Oct 2020 10:43:39 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7080D206B2; Tue, 27 Oct 2020 14:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809819; bh=6EsG4J3qaTfb+6PTdylTCV8RwtHyBqmGpqFKCjSOQ5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HpVJ9CzwcDrcElljPfwaHTIY5ZgPJEIzwauu64um015gIClKDHjdJtGO4iJJjFG/m cUoF2aTzt5QejKOQGLihJqwIy3TaMlzhSEJ68bXLmynRQ6iwqn/O0PULRK4/9UA/5b gnv27imKErVFRWHghGhh8XL7/wjII03lZUdfh9Ao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.4 331/408] media: st-delta: Fix reference count leak in delta_run_work Date: Tue, 27 Oct 2020 14:54:29 +0100 Message-Id: <20201027135510.395336987@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Aditya Pakki [ Upstream commit 57cc666d36adc7b45e37ba4cd7bc4e44ec4c43d7 ] delta_run_work() calls delta_get_sync() that increments the reference counter. In case of failure, decrement the reference count by calling delta_put_autosuspend(). Signed-off-by: Aditya Pakki Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/sti/delta/delta-v4l2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/sti/delta/delta-v4l2.c b/drivers/media/platform/sti/delta/delta-v4l2.c index 91369fb3ffaa4..2791107e641bc 100644 --- a/drivers/media/platform/sti/delta/delta-v4l2.c +++ b/drivers/media/platform/sti/delta/delta-v4l2.c @@ -954,8 +954,10 @@ static void delta_run_work(struct work_struct *work) /* enable the hardware */ if (!dec->pm) { ret = delta_get_sync(ctx); - if (ret) + if (ret) { + delta_put_autosuspend(ctx); goto err; + } } /* decode this access unit */