From patchwork Mon May 23 11:38:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Falak R Wani X-Patchwork-Id: 9132197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1C57F60761 for ; Mon, 23 May 2016 17:27:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11F282823A for ; Mon, 23 May 2016 17:27:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0693B28246; Mon, 23 May 2016 17:27:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5A662823A for ; Mon, 23 May 2016 17:27:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 137EA6E2BA; Mon, 23 May 2016 17:27:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 72C876E061 for ; Mon, 23 May 2016 11:38:53 +0000 (UTC) Received: by mail-pf0-x244.google.com with SMTP id 145so18618725pfz.1 for ; Mon, 23 May 2016 04:38:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=kvw25OV1FwufD+OQvLsDPPtcNVm2W+Qdlk3o4kredlo=; b=vhMpF3QhYr/2Px5HXvFb/pdIonIW2rI9fLEWYhy5UHQS1/Zgp9ksyaa2Yv0Ti26Lho xoEcer7zdip5DwfuJmxEv1Ai7OE90cxN/X+Il7bHpAHQiEFZhyV3zDv4ngfo99cOuKDA q4ELXD/epiVnW36uS2I3wtZm5W47cwQKis3hqqI+AmcIuz2KnCXs5pqMk9iFR+g7/8Cw XzW+1a+WR73yGnc6Wv9kHVp5Z0wp3QaNBw2lFNNQonlxFcyyHnA6Z1VcmkKmdzlugO3B mm67MOdF14+k9V/KPhuhyCRpUp4p0TZKbg820G3cOU914SvlT0/UtwVM5RG94RdV1Awt tY1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kvw25OV1FwufD+OQvLsDPPtcNVm2W+Qdlk3o4kredlo=; b=Vjl+Pghm0gGjw2BDxyPvaYp/0eKGehM5QEgeD4BH83BuM/mrYSzJEHK03vlFf+ghZy /Dyh9cv7KpQjYn2qEUa0WvV1LGNUKzS1d0MoG1eFL29wbsfGNPaxKcxFs5s1f+sodKSb UpdWjmcnTONWjNHO8zLvnd46rf50KZrvLwqgD0o5qT6Ye9jlEsRv7WHQkexKcbxLhhp+ Xvzk0khtBXSdeh65vMBWKHXY36c1o7GyHfBq9LMBfSlq0Pes5VPS8UZsw2IeGw27paU2 QDirolYEUA8vTr4AkgdAd3Ylfh7gMP3Ugw4jFkGyi6Wkf9cf5kclDyFfOo/mmc/dlbAu dPcg== X-Gm-Message-State: AOPr4FWl7Jgm5E0xe7KR8njNsO6WaU/5JK57FqtBZCM/mGvh8See9gSKGMkFKyeSXK0TSg== X-Received: by 10.98.113.1 with SMTP id m1mr26699500pfc.150.1464003532208; Mon, 23 May 2016 04:38:52 -0700 (PDT) Received: from kp.domain.name ([110.235.28.83]) by smtp.gmail.com with ESMTPSA id i6sm46113463pfc.65.2016.05.23.04.38.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 May 2016 04:38:51 -0700 (PDT) From: Muhammad Falak R Wani To: Sumit Semwal Subject: [PATCH v2] dma-buf: use vma_pages(). Date: Mon, 23 May 2016 17:08:42 +0530 Message-Id: <1464003522-27682-1-git-send-email-falakreyaz@gmail.com> X-Mailer: git-send-email 1.9.1 X-Mailman-Approved-At: Mon, 23 May 2016 17:27:31 +0000 Cc: "moderated list:DMA BUFFER SHARING FRAMEWORK" , open list , "open list:DMA BUFFER SHARING FRAMEWORK" , "open list:DMA BUFFER SHARING FRAMEWORK" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Replace explicit computation of vma page count by a call to vma_pages(). Also, include Signed-off-by: Muhammad Falak R Wani --- drivers/dma-buf/dma-buf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 4a2c07e..6355ab3 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -33,6 +33,7 @@ #include #include #include +#include #include @@ -90,7 +91,7 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) dmabuf = file->private_data; /* check for overflowing the buffer's size */ - if (vma->vm_pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) > + if (vma->vm_pgoff + vma_pages(vma) > dmabuf->size >> PAGE_SHIFT) return -EINVAL; @@ -723,11 +724,11 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, return -EINVAL; /* check for offset overflow */ - if (pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) < pgoff) + if (pgoff + vma_pages(vma) < pgoff) return -EOVERFLOW; /* check for overflowing the buffer's size */ - if (pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) > + if (pgoff + vma_pages(vma) > dmabuf->size >> PAGE_SHIFT) return -EINVAL;