diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-12-09 13:45:46 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-12-09 23:24:35 +0000 |
| commit | b31459adeab018b297541e288ac88873011da82a (patch) | |
| tree | eca8de340db8e002f3c53a1cf1fe8d3272951a2c /arch/arm/kernel/traps.c | |
| parent | 3abb6671a9c04479c4bd026798a05f857393b7e2 (diff) | |
| download | linux-b31459adeab018b297541e288ac88873011da82a.tar.gz linux-b31459adeab018b297541e288ac88873011da82a.tar.bz2 linux-b31459adeab018b297541e288ac88873011da82a.zip | |
ARM: 7917/1: cacheflush: correctly limit range of memory region being flushed
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.
Cc: <stable@vger.kernel.org>
Reported-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Tested-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 3 |
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(); |