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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 C093FC282C3 for ; Thu, 24 Jan 2019 20:16:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9128C218D0 for ; Thu, 24 Jan 2019 20:16:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548360991; bh=Ze1Kl1fxkKQSrnFhdNeQvAk5lJOILF1degH+rnpf2D4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MGWTOhyZURaNJT+0bPuvyJKwp1U0RHd3G7QnaWGs+wKWN2dDrmd1TNayfCNhEuacG h6ZSlbU+8sUacEllLkKRcK0Y4GbFcUKozuHIicUb7nHZRbPo6Eg0f5si9rV1MBp+7n 9h2o9plsgz86dszZFfH8SyMoIv1sGCh/ckSVAPrU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729721AbfAXUQ3 (ORCPT ); Thu, 24 Jan 2019 15:16:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:49074 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729978AbfAXTYB (ORCPT ); Thu, 24 Jan 2019 14:24:01 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 0699C217D7; Thu, 24 Jan 2019 19:23:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548357840; bh=Ze1Kl1fxkKQSrnFhdNeQvAk5lJOILF1degH+rnpf2D4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UNzekUOZg3FLifmNG2t6PSZIIrB+DsjMNgkn8cvAYCLrLirTK1lrvmXrzAfaz6o2c edvi1OolvpQOtyt6sS9bRviRS/YT0DWxBc2hHbZ9Ntxn8KpDVVs6/PRCOyg5V6F/rm QoylA+85EuS6EGXreaB3fA6ErsukYBYQ8sSQ9Ry4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 3.18 33/52] media: vb2: be sure to unlock mutex on errors Date: Thu, 24 Jan 2019 20:19:57 +0100 Message-Id: <20190124190148.098013082@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190140.879495253@linuxfoundation.org> References: <20190124190140.879495253@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mauro Carvalho Chehab commit c06ef2e9acef4cda1feee2ce055b8086e33d251a upstream. As reported by smatch: drivers/media/common/videobuf2/videobuf2-core.c: drivers/media/common/videobuf2/videobuf2-core.c:2159 vb2_mmap() warn: inconsistent returns 'mutex:&q->mmap_lock'. Locked on: line 2148 Unlocked on: line 2100 line 2108 line 2113 line 2118 line 2156 line 2159 There is one error condition that doesn't unlock a mutex. Fixes: cd26d1c4d1bc ("media: vb2: vb2_mmap: move lock up") Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/v4l2-core/videobuf2-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -2501,7 +2501,8 @@ int vb2_mmap(struct vb2_queue *q, struct if (length < (vma->vm_end - vma->vm_start)) { dprintk(1, "MMAP invalid, as it would overflow buffer length\n"); - return -EINVAL; + ret = -EINVAL; + goto unlock; } ret = call_memop(vb, mmap, vb->planes[plane].mem_priv, vma);