From patchwork Sun Dec 16 20:04:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 1885531 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F2E3940D2D for ; Sun, 16 Dec 2012 20:05:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123Ab2LPUEs (ORCPT ); Sun, 16 Dec 2012 15:04:48 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:60389 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751700Ab2LPUEs (ORCPT ); Sun, 16 Dec 2012 15:04:48 -0500 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1TkKS6-0007Xl-Hk; Sun, 16 Dec 2012 20:04:46 +0000 Date: Sun, 16 Dec 2012 20:04:46 +0000 From: Al Viro To: Paul Bolle Cc: Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: Re: [PATCH] omap_vout: find_vma() needs ->mmap_sem held Message-ID: <20121216200446.GF4939@ZenIV.linux.org.uk> References: <20121215201237.GW4939@ZenIV.linux.org.uk> <1355688070.767.4.camel@x61.thuisdomein> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1355688070.767.4.camel@x61.thuisdomein> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Sun, Dec 16, 2012 at 09:01:10PM +0100, Paul Bolle wrote: > > + vma = find_vma(mm, virtp); > > } else if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) { > > Shouldn't that line become > if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) { > > so that this actually compiles? *Do'h* Yes, it should. Mea culpa... Signed-off-by: Al Viro Acked-by: Laurent Pinchart --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 9935040..cb564d0 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c @@ -207,19 +207,21 @@ static u32 omap_vout_uservirt_to_phys(u32 virtp) struct vm_area_struct *vma; struct mm_struct *mm = current->mm; - vma = find_vma(mm, virtp); /* For kernel direct-mapped memory, take the easy way */ - if (virtp >= PAGE_OFFSET) { - physp = virt_to_phys((void *) virtp); - } else if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) { + if (virtp >= PAGE_OFFSET) + return virt_to_phys((void *) virtp); + + down_read(¤t->mm->mmap_sem); + vma = find_vma(mm, virtp); + if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) { /* this will catch, kernel-allocated, mmaped-to-usermode addresses */ physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start); + up_read(¤t->mm->mmap_sem); } else { /* otherwise, use get_user_pages() for general userland pages */ int res, nr_pages = 1; struct page *pages; - down_read(¤t->mm->mmap_sem); res = get_user_pages(current, current->mm, virtp, nr_pages, 1, 0, &pages, NULL);