From patchwork Sat Dec 14 03:26:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22473 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D8AD123908 for ; Sat, 14 Dec 2013 03:27:04 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf9935641oag.5 for ; Fri, 13 Dec 2013 19:27:04 -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=HgGSczYCVsKGCEJpESdgxloVpHBx4r/3lsaOzWp6x7A=; b=esNFwzzugqDlyVBMGgGCX/kskH0nTVNNULSN/859r8NHdBSUETAevb7GiNf9okLQKW /XV3Tuzbh/Jl2+d16+UcWP4x55U8WWwgdBZRxlDLalZnGPvQmC+Dqvxd4xOzmkXfdvLz z7VB0dR7OVsZwAsV+GTD5hlLhRyJOD/cqTSurA3gfbpWsuTR++huf/m3gUbtQuwtrYz0 7cNbJkOgwW6vmSMeWVc3um/YVok1DKdY4g9FbykhdziOUOBLIw844AouC0w0AIJbH5f6 p4lTU7Yv52U/APYjgdvWcceS/FbgqGcRDbaIfHvBlRHv5Rue1b4FX9fW0f+nk/TFdyFk Mz6A== X-Gm-Message-State: ALoCoQlGYQj9S2QJ8tNuChC2JFN8G0IUWJEGFmFuMD7CfQMFnUqPCDYL9WERnBR5HCUcgdfaziBX X-Received: by 10.182.55.102 with SMTP id r6mr2239668obp.7.1386991624507; Fri, 13 Dec 2013 19:27:04 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.81 with SMTP id da17ls1332678qeb.22.gmail; Fri, 13 Dec 2013 19:27:04 -0800 (PST) X-Received: by 10.220.185.137 with SMTP id co9mr5313vcb.59.1386991624377; Fri, 13 Dec 2013 19:27:04 -0800 (PST) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id e3si1429299vek.55.2013.12.13.19.27.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:27:04 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.180 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.180; Received: by mail-vc0-f180.google.com with SMTP id if17so1822444vcb.25 for ; Fri, 13 Dec 2013 19:27:04 -0800 (PST) X-Received: by 10.52.164.16 with SMTP id ym16mr2193761vdb.39.1386991624300; Fri, 13 Dec 2013 19:27:04 -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 u4csp86952vcz; Fri, 13 Dec 2013 19:27:04 -0800 (PST) X-Received: by 10.68.200.129 with SMTP id js1mr7335800pbc.14.1386991623537; Fri, 13 Dec 2013 19:27:03 -0800 (PST) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by mx.google.com with ESMTPS id j8si1387740pad.207.2013.12.13.19.27.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:27:03 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.182 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.192.182; Received: by mail-pd0-f182.google.com with SMTP id v10so3222064pde.41 for ; Fri, 13 Dec 2013 19:27:03 -0800 (PST) X-Received: by 10.66.123.5 with SMTP id lw5mr7140589pab.83.1386991622780; Fri, 13 Dec 2013 19:27:02 -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 nw11sm11680086pab.13.2013.12.13.19.27.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:27:02 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , John Stultz Subject: [PATCH 103/115] ion: check return value from remap_pfn_range Date: Fri, 13 Dec 2013 19:26:23 -0800 Message-Id: <1386991595-6251-11-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386991595-6251-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> <1386991595-6251-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.180 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: Colin Cross Check the return value of remap_pfn_range and return an error if it fails. Signed-off-by: Colin Cross Signed-off-by: John Stultz --- drivers/staging/android/ion/ion_heap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index ce31561..ecc14fd 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -76,6 +76,7 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer, unsigned long offset = vma->vm_pgoff * PAGE_SIZE; struct scatterlist *sg; int i; + int ret; for_each_sg(table->sgl, sg, table->nents, i) { struct page *page = sg_page(sg); @@ -91,8 +92,10 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer, offset = 0; } len = min(len, remainder); - remap_pfn_range(vma, addr, page_to_pfn(page), len, + ret = remap_pfn_range(vma, addr, page_to_pfn(page), len, vma->vm_page_prot); + if (ret) + return ret; addr += len; if (addr >= vma->vm_end) return 0;