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=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 B9F42C282C3 for ; Thu, 24 Jan 2019 19:26:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89600217D7 for ; Thu, 24 Jan 2019 19:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548357992; bh=bjUT/IGDLMU7lbIn7Fva6a7dpHBlpPnvDLiMxVrp7FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Mxy2xzPiwVqI860oSg71QtX+XLZAxtM0je+NgHU3ZEVp7/aFqMCGmR8stCz6Q/1vP oWRe1+E/2yNChopXZyUSBR3qvUfve2Kkyeo/76LO82f9Mvj57ufJCjnoij7q835OBx p/xUgaQqkWHIrIjoInr+C0EliIpTHtpP4JOSCW0A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730577AbfAXT0b (ORCPT ); Thu, 24 Jan 2019 14:26:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:52506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729813AbfAXT02 (ORCPT ); Thu, 24 Jan 2019 14:26:28 -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 3B8CB218FC; Thu, 24 Jan 2019 19:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548357987; bh=bjUT/IGDLMU7lbIn7Fva6a7dpHBlpPnvDLiMxVrp7FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kDPxw8mRSvt0DU087dh96PE7sOh+1WIigWwyLTNlqIFJmsHrcjsxrLGr49my/JV84 ZENeisPCdC7CqitRaHxMQ+XgxiCFzm+zPvESwpi388uAeOcAabvXwATr5sHGVHGs19 7BZVMmq9gzQtvtnPTRgekz2N/WmfGw282bivqhMU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Verkuil , syzbot+be93025dd45dccd8923c@syzkaller.appspotmail.com, Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.4 058/104] media: vb2: vb2_mmap: move lock up Date: Thu, 24 Jan 2019 20:19:47 +0100 Message-Id: <20190124190202.104335919@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190154.968308875@linuxfoundation.org> References: <20190124190154.968308875@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 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans Verkuil commit cd26d1c4d1bc947b56ae404998ae2276df7b39b7 upstream. If a filehandle is dup()ped, then it is possible to close it from one fd and call mmap from the other. This creates a race condition in vb2_mmap where it is using queue data that __vb2_queue_free (called from close()) is in the process of releasing. By moving up the mutex_lock(mmap_lock) in vb2_mmap this race is avoided since __vb2_queue_free is called with the same mutex locked. So vb2_mmap now reads consistent buffer data. Signed-off-by: Hans Verkuil Reported-by: syzbot+be93025dd45dccd8923c@syzkaller.appspotmail.com Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/v4l2-core/videobuf2-core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -1976,9 +1976,13 @@ int vb2_mmap(struct vb2_queue *q, struct return -EINVAL; } } + + mutex_lock(&q->mmap_lock); + if (vb2_fileio_is_active(q)) { dprintk(1, "mmap: file io in progress\n"); - return -EBUSY; + ret = -EBUSY; + goto unlock; } /* @@ -1986,7 +1990,7 @@ int vb2_mmap(struct vb2_queue *q, struct */ ret = __find_plane_by_offset(q, off, &buffer, &plane); if (ret) - return ret; + goto unlock; vb = q->bufs[buffer]; @@ -2002,8 +2006,9 @@ int vb2_mmap(struct vb2_queue *q, struct return -EINVAL; } - mutex_lock(&q->mmap_lock); ret = call_memop(vb, mmap, vb->planes[plane].mem_priv, vma); + +unlock: mutex_unlock(&q->mmap_lock); if (ret) return ret;