From 47afbb71ead31e5378b9dddf22f92a5ff9bb9d6b Mon Sep 17 00:00:00 2001 From: Sri Krishna chowdary Date: Wed, 2 Sep 2015 22:50:59 +0530 Subject: gpu: nvgpu: fix alignment calculation consider buffer size as well when calculating the required alignment for a buffer else we would be mapping a VA range greater than requested thus allowing access to entire large page even when not needed creating a security hole. Bug 1492689 Change-Id: Ic404708d238621ea64c26cafd05bc30ba8e02e12 Signed-off-by: Sri Krishna chowdary Reviewed-on: http://git-master/r/793229 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman Reviewed-by: Deepak Nibade Reviewed-by: Sachin Nikam --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index b12091bf..37151cda 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -1423,7 +1423,7 @@ u64 gk20a_vm_map(struct vm_gk20a *vm, sgl = sg_next(sgl); } } else - bfr.align = 1 << __ffs(buf_addr); + bfr.align = 1 << __ffs(buf_addr | bfr.size); bfr.pgsz_idx = -1; mapping_size = mapping_size ? mapping_size : bfr.size; -- cgit v1.2.2