diff options
author | Takashi Iwai | 2012-11-22 21:22:39 +0100 |
---|---|---|
committer | Takashi Iwai | 2012-11-22 21:22:39 +0100 |
commit | 2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (patch) | |
tree | 08470935de327cb438cc9ec738b0e025c3c0b556 /arch/s390/mm/gup.c | |
parent | ALSA: emu10k1: Add missing ifdef for emu->suspend reference (diff) | |
parent | ALSA: snd-usb: properly initialize the sync endpoint (diff) | |
download | kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.gz kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.tar.xz kernel-qcow2-linux-2ba509a6baac097cc8ae4f9741a09ba7c1c0d916.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/s390/mm/gup.c')
-rw-r--r-- | arch/s390/mm/gup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c index 8b8285310b5a..1f5315d1215c 100644 --- a/arch/s390/mm/gup.c +++ b/arch/s390/mm/gup.c @@ -180,8 +180,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 (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ, - (void __user *)start, len))) + if ((end < start) || (end > TASK_SIZE)) return 0; local_irq_save(flags); @@ -229,7 +228,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; /* |