summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-12-05 14:29:24 +0000
committerJon Medhurst <tixy@linaro.org>2013-12-05 15:09:30 +0000
commitc7f6c4257b883fc2d76b12cc8904994665760dc8 (patch)
tree6cecbed7a465c6d61430ada649718705b71c6787
parentc59ea19258eed520acef080c58d17ca9b5b3af81 (diff)
ARM: cacheflush: correctly limit range of memory region being flushedtracking-integration-linaro-vexpress-ll-20131206.0tracking-integration-linaro-vexpress-ll-20131205.0
The __do_cache_op function operates with a 'chunk' size of one page but fails to limit the size of the final chunk so as to not exceed the specified memory region. Fix this. Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--arch/arm/kernel/traps.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index dbf0923e8d76..7940241f0576 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -509,9 +509,10 @@ static inline int
__do_cache_op(unsigned long start, unsigned long end)
{
int ret;
- unsigned long chunk = PAGE_SIZE;
do {
+ unsigned long chunk = min(PAGE_SIZE, end - start);
+
if (signal_pending(current)) {
struct thread_info *ti = current_thread_info();