From patchwork Sat May 21 13:23:32 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: 9130595 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 6D0416048B for ; Sat, 21 May 2016 16:03:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6225627F17 for ; Sat, 21 May 2016 16:03:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56D4B28114; Sat, 21 May 2016 16:03:20 +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 1AEB727F17 for ; Sat, 21 May 2016 16:03:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E79536E363; Sat, 21 May 2016 16:03:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-x242.google.com (mail-pa0-x242.google.com [IPv6:2607:f8b0:400e:c03::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 401886E1DE for ; Sat, 21 May 2016 13:23:38 +0000 (UTC) Received: by mail-pa0-x242.google.com with SMTP id yl2so13475344pac.1 for ; Sat, 21 May 2016 06:23:38 -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=hwIaPmjYWJnsQpWXjjo8B7JV03xH/omgD9IkFQ6jnI4=; b=eihJ9sDDbOMKbtNlHH4hoNgvzyKcLCzzs0Pf+DHy0r3QdGwKPqFMjox6t5OsWWf+TZ kYgHt8hIodyEkmx3XhS7a2kjPPQQcTUUUvd0OLDyNEpC9DKrNfGe2jHJMwB1pz5Ht9qk V+NBS5r38c9ioRiZXSG8N6bSIFiyOPOw/pjBC/JIQ0MTd7JNxp08PLd48AWbY9y0fQVg 7o+smqmSFT3MT8sK4CdvEzizp/UGg/WfpVyEXG0kz4mXhTrp12EFN4bw6Msdz+K4/BIK bOjOXtu4wyxCDpXTJT9FGStUajS9TS6LHshCfBUoY99SnWfvMt30Qi4LMKr9n+w+jDM7 eyHQ== 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=hwIaPmjYWJnsQpWXjjo8B7JV03xH/omgD9IkFQ6jnI4=; b=hPIgNJW0U6nAdZqCG07BYlNvZO6Yq+85Pnc/8GrzJfWfPmZfxAq5MtKsblmeqGViYV ct/xKsTUOAm76gixe/ywPCiNTYLnuMhmlRQVNePfbHr184Y9aWuHAVE4w9aCPEMX3AI1 qwcWNfjVyLVuufQhW+jv4YPs9n9E5dlWJx+wOn9ETEkA9WgXKqy6KERM+/Jkl6rW02Jb GU/FBq+BjHFWqWEwAytts+AoEM5Wf3KNmk+06C2UQ2i/wW3gYvLjt1GShYrzHr6jv2qa pbamICLZ1EvAI4rOtJehid2Xan3vOMznzWv7YEjFfx62N/2oDkgyn4QyUXNlwYTXX43X 6++A== X-Gm-Message-State: AOPr4FVvEeMJfFJD+Cy+VLUXI3clv2nawQ1fmxI7cfv0s2E1wyJlnY8d+Uif7anvF5MTuw== X-Received: by 10.66.232.226 with SMTP id tr2mr12891331pac.44.1463837017654; Sat, 21 May 2016 06:23:37 -0700 (PDT) Received: from kp.domain.name ([110.235.28.83]) by smtp.gmail.com with ESMTPSA id i75sm34272902pfj.51.2016.05.21.06.23.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 21 May 2016 06:23:37 -0700 (PDT) From: Muhammad Falak R Wani To: Sumit Semwal Subject: [PATCH] dma-buf: use vma_pages(). Date: Sat, 21 May 2016 18:53:32 +0530 Message-Id: <1463837013-17074-1-git-send-email-falakreyaz@gmail.com> X-Mailer: git-send-email 1.9.1 X-Mailman-Approved-At: Sat, 21 May 2016 16:03:10 +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() Signed-off-by: Muhammad Falak R Wani Reviewed-by: Eric Engestrom --- drivers/dma-buf/dma-buf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 4a2c07e..b0317ec 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -90,7 +90,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 +723,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;