diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-10-22 15:49:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:37:44 -0800 |
| commit | 3e31ee155e0963e42bb02d33a2a9e44d5b91a45b (patch) | |
| tree | 8c5a1d4355768f36f1d4cd9f136ae3d9d87c222c /arch | |
| parent | 87dd2c484ae11e2e0a34996d96bfbfaf20f57b45 (diff) | |
| download | linux-3.10-3e31ee155e0963e42bb02d33a2a9e44d5b91a45b.tar.gz linux-3.10-3e31ee155e0963e42bb02d33a2a9e44d5b91a45b.tar.bz2 linux-3.10-3e31ee155e0963e42bb02d33a2a9e44d5b91a45b.zip | |
s390/gup: add missing TASK_SIZE check to get_user_pages_fast()
commit d55c4c613fc4d4ad2ba0fc6fa2b57176d420f7e4 upstream.
When walking page tables we need to make sure that everything
is within bounds of the ASCE limit of the task's address space.
Otherwise we might calculate e.g. a pud pointer which is not
within a pud and dereference it.
So check against TASK_SIZE (which is the ASCE limit) before
walking page tables.
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/mm/gup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c index 65cb06e2af4..4ccf9f54355 100644 --- a/arch/s390/mm/gup.c +++ b/arch/s390/mm/gup.c @@ -183,7 +183,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; end = start + len; - if (end < start) + if ((end < start) || (end > TASK_SIZE)) goto slow_irqon; /* |