diff options
| author | Julius Werner <jwerner@chromium.org> | 2017-05-12 14:42:58 -0700 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-06-08 06:12:47 -0400 |
| commit | 9ef27e6ccbe0f3a822d6b446978522e9ae4424dc (patch) | |
| tree | c0da96328518fa513858f9b6216e434c675780b9 /drivers/char | |
| parent | 682182e924eaa20d0b00b8e3297a50bf87855ddf (diff) | |
drivers: char: mem: Check for address space wraparound with mmap()
[ Upstream commit b299cde245b0b76c977f4291162cf668e087b408 ]
/dev/mem currently allows mmap() mappings that wrap around the end of
the physical address space, which should probably be illegal. It
circumvents the existing STRICT_DEVMEM permission check because the loop
immediately terminates (as the start address is already higher than the
end address). On the x86_64 architecture it will then cause a panic
(from the BUG(start >= end) in arch/x86/mm/pat.c:reserve_memtype()).
This patch adds an explicit check to make sure offset + size will not
wrap around in the physical address type.
Signed-off-by: Julius Werner <jwerner@chromium.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/mem.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 6b1721f978c2..0ab72dea34ce 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -321,6 +321,11 @@ static const struct vm_operations_struct mmap_mem_ops = { static int mmap_mem(struct file *file, struct vm_area_struct *vma) { size_t size = vma->vm_end - vma->vm_start; + phys_addr_t offset = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT; + + /* It's illegal to wrap around the end of the physical address space. */ + if (offset + (phys_addr_t)size < offset) + return -EINVAL; if (!valid_mmap_phys_addr_range(vma->vm_pgoff, size)) return -EINVAL; |