From patchwork Fri Dec 13 22:23:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22380 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 88B7923FBA for ; Fri, 13 Dec 2013 22:26:30 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id i17sf4358148qcy.2 for ; Fri, 13 Dec 2013 14:26:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=75z7S73FyZnGPwzznyl3LCRA35wzzjLvfHFPGWtd8xI=; b=I6im6lKSZbGLRkqu+0jYB9HmXzNuqA7S0+eAFzuPqySBfXiPS7jUWF+Nu5GMje4/S2 jCfnQ3NolOQRZDsma6RTATg8Xmc/xcMQ9yjvLxTy+QiBuVqJmhC0YWUSEUJTeP/bfbae UM5iQPIAZYHTqQB9OJDFel2r6p1XUSM1J15TYRWgeLAWUIdfNGTxyiQUxI/ocG89zssJ mEjJuZ2des8FPtUcnFYwU0QCOZihmKiHIso8u/Bc4iYzy8JDM6gGZerHxjkvtrGsGiiX KcSyGyYAUM7fA8kfetJ+Ul2qP//zLwDyJH2sz1i1sVkWDBqcYBNiiZ34HLbh7CMO7Pzz AcaQ== X-Gm-Message-State: ALoCoQkNJOZdP4j5ixCQJRKL1Nq7ZuYweqZkslXKzEjwAnvudl8cJDShcOI9PWhANs5haKuFBae4 X-Received: by 10.236.19.36 with SMTP id m24mr1530493yhm.14.1386973590385; Fri, 13 Dec 2013 14:26:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.119.196 with SMTP id kw4ls1213496qeb.90.gmail; Fri, 13 Dec 2013 14:26:30 -0800 (PST) X-Received: by 10.58.100.244 with SMTP id fb20mr2211341veb.6.1386973590267; Fri, 13 Dec 2013 14:26:30 -0800 (PST) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id pt3si1201470vec.32.2013.12.13.14.26.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id ij19so1745912vcb.31 for ; Fri, 13 Dec 2013 14:26:30 -0800 (PST) X-Received: by 10.220.183.199 with SMTP id ch7mr2206561vcb.27.1386973590175; Fri, 13 Dec 2013 14:26:30 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp73468vcz; Fri, 13 Dec 2013 14:26:29 -0800 (PST) X-Received: by 10.66.144.227 with SMTP id sp3mr6117512pab.100.1386973589445; Fri, 13 Dec 2013 14:26:29 -0800 (PST) Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by mx.google.com with ESMTPS id vv1si2435633pbb.209.2013.12.13.14.26.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.49 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.49; Received: by mail-pa0-f49.google.com with SMTP id kx10so593373pab.36 for ; Fri, 13 Dec 2013 14:26:29 -0800 (PST) X-Received: by 10.66.170.138 with SMTP id am10mr6018872pac.51.1386973588849; Fri, 13 Dec 2013 14:26:28 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id qz9sm7457908pbc.3.2013.12.13.14.26.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:26:28 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , Laura Abbott , John Stultz Subject: [PATCH 015/115] gpu: ion: Map only the vma size given Date: Fri, 13 Dec 2013 14:23:49 -0800 Message-Id: <1386973529-4884-16-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Laura Abbott When mapping carveout buffers into userspace, only map the size of the vma given, not the full size of the buffer since clients may map less than the buffer size. Signed-off-by: Laura Abbott [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz --- drivers/staging/android/ion/ion_carveout_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c index e8c4e36..16f4fc7 100644 --- a/drivers/staging/android/ion/ion_carveout_heap.c +++ b/drivers/staging/android/ion/ion_carveout_heap.c @@ -116,7 +116,7 @@ int ion_carveout_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer, { return remap_pfn_range(vma, vma->vm_start, __phys_to_pfn(buffer->priv_phys) + vma->vm_pgoff, - buffer->size, + vma->vm_end - vma->vm_start, pgprot_noncached(vma->vm_page_prot)); }