From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 C4B9DC43603 for ; Thu, 19 Dec 2019 19:10:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 90AC2222C2 for ; Thu, 19 Dec 2019 19:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576782605; bh=3TyHLECnAYyzfBaEV8UiIq2Z47lEaK7x3GlGm2MucmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rXY+NwPWs14MS5HJ9ygNJA9qavp/GqQf59iuTCSI6DK0YjXS36aKqym9cNCJauy1B zyvOyIuIwOGea0mTHM+4a8zMQy3GKNExK4rdiX5qUNDlPiqWOv04/AYlLRhmel+jWB f4E68JaLijXZI6wIYL6BREaVDUS9TNzG0ViKG9AE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727980AbfLSSjv (ORCPT ); Thu, 19 Dec 2019 13:39:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:58334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728286AbfLSSju (ORCPT ); Thu, 19 Dec 2019 13:39:50 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 4946224685; Thu, 19 Dec 2019 18:39:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780789; bh=3TyHLECnAYyzfBaEV8UiIq2Z47lEaK7x3GlGm2MucmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ysspoL83e6xS3JibSja+8v8hbui0+jHKDGFeGYqdjL2P+0hnD8qgnCN5iRqTFm1y/ JADWvhGIgJUcI6GPsPLnUwPLkMDCQOoQUOHK5iS4+zrANkYhdnsU6c97XywlGbGSLM Us0CqsA4eaEHGMXs3G2pmsqOgxfpa+JXvWRDPZ0c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Fabien Dessenne , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.4 111/162] media: bdisp: fix memleak on release Date: Thu, 19 Dec 2019 19:33:39 +0100 Message-Id: <20191219183214.500867406@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johan Hovold commit 11609a7e21f8cea42630350aa57662928fa4dc63 upstream. If a process is interrupted while accessing the video device and the device lock is contended, release() could return early and fail to free related resources. Note that the return value of the v4l2 release file operation is ignored. Fixes: 28ffeebbb7bd ("[media] bdisp: 2D blitter driver using v4l2 mem2mem framework") Cc: stable # 4.2 Signed-off-by: Johan Hovold Reviewed-by: Fabien Dessenne Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c +++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c @@ -652,8 +652,7 @@ static int bdisp_release(struct file *fi dev_dbg(bdisp->dev, "%s\n", __func__); - if (mutex_lock_interruptible(&bdisp->lock)) - return -ERESTARTSYS; + mutex_lock(&bdisp->lock); v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);