diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-06-17 00:30:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-10 09:53:47 +0200 |
| commit | 2b8f8a80ca8ba27de5f6d94f2ab8bbeb97ffbe6b (patch) | |
| tree | fe0d16e4734edf884bc4e6adb0f6696d03e5729c | |
| parent | 80b25628ff26e256864f0fdb5891a6b016f65652 (diff) | |
| download | linux-stable-2b8f8a80ca8ba27de5f6d94f2ab8bbeb97ffbe6b.tar.gz linux-stable-2b8f8a80ca8ba27de5f6d94f2ab8bbeb97ffbe6b.tar.bz2 linux-stable-2b8f8a80ca8ba27de5f6d94f2ab8bbeb97ffbe6b.zip | |
MIPS: Fix bounds check virt_addr_valid
commit d6ed083f5cc621e15c15b56c3b585fd524dbcb0f upstream.
The bounds check used the uninitialized variable vaddr, it should use
the given parameter kaddr instead. When using the uninitialized value
the compiler assumed it to be 0 and optimized this function to just
return 0 in all cases.
This should make the function check the range of the given address and
only do the page map check in case it is in the expected range of
virtual addresses.
Fixes: 074a1e1167af ("MIPS: Bounds check virt_addr_valid")
Cc: stable@vger.kernel.org # v4.12+
Cc: Paul Burton <paul.burton@mips.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: ralf@linux-mips.org
Cc: jhogan@kernel.org
Cc: f4bug@amsat.org
Cc: linux-mips@vger.kernel.org
Cc: ysu@wavecomp.com
Cc: jcristau@debian.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/mips/mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c index 7755a1fad05a..1b705fb2f10c 100644 --- a/arch/mips/mm/mmap.c +++ b/arch/mips/mm/mmap.c @@ -203,7 +203,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) int __virt_addr_valid(const volatile void *kaddr) { - unsigned long vaddr = (unsigned long)vaddr; + unsigned long vaddr = (unsigned long)kaddr; if ((vaddr < PAGE_OFFSET) || (vaddr >= MAP_BASE)) return 0; |