From 1fb5af21e524f5b3663aee6a7074de419bd674f9 Mon Sep 17 00:00:00 2001 From: Krishna Reddy Date: Wed, 14 Sep 2011 16:33:18 -0700 Subject: video: tegra: nvmap: Fix mem size check during mem map. Bug 871094 (cherry picked from commit 7eb5215660d7e54d2ff84dae17cb00071695aed1) Change-Id: I4fa16032ce90cd728b2eb32696034a7cfc506717 Reviewed-on: http://git-master/r/54845 Reviewed-by: Varun Colbert Tested-by: Varun Colbert Rebase-Id: R61d721bbef3293f802a4358560f18bced53c1761 --- drivers/video/tegra/nvmap/nvmap_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/video/tegra/nvmap') diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.c b/drivers/video/tegra/nvmap/nvmap_ioctl.c index 76fa897b41e0..8e64584b5e50 100644 --- a/drivers/video/tegra/nvmap/nvmap_ioctl.c +++ b/drivers/video/tegra/nvmap/nvmap_ioctl.c @@ -287,7 +287,7 @@ int nvmap_map_into_caller_ptr(struct file *filp, void __user *arg) cache_flags = op.flags & NVMAP_HANDLE_CACHE_FLAG; if (cache_flags == NVMAP_HANDLE_INNER_CACHEABLE || cache_flags == NVMAP_HANDLE_CACHEABLE) { - if (h->orig_size & ~PAGE_MASK) { + if (h->size & ~PAGE_MASK) { pr_err("\n%s:attempt to convert a buffer from uc/wc to" " wb, whose size is not a multiple of page size." " request ignored.\n", __func__); -- cgit v1.2.3