diff options
| author | Julius Werner <jwerner@chromium.org> | 2017-06-02 15:36:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-14 12:54:20 +0200 |
| commit | c4b784e7a35ba4c2b322a695b911c8d55868783b (patch) | |
| tree | edd9210b083b032b8b29b0fe25d72a637b0097c0 /drivers/char | |
| parent | 96f81ced46b3742300682808708506b6ce8551b2 (diff) | |
| download | linux-stable-c4b784e7a35ba4c2b322a695b911c8d55868783b.tar.gz linux-stable-c4b784e7a35ba4c2b322a695b911c8d55868783b.tar.bz2 linux-stable-c4b784e7a35ba4c2b322a695b911c8d55868783b.zip | |
drivers: char: mem: Fix wraparound check to allow mappings up to the end
commit 32829da54d9368103a2f03269a5120aa9ee4d5da upstream.
A recent fix to /dev/mem prevents mappings from wrapping around the end
of physical address space. However, the check was written in a way that
also prevents a mapping reaching just up to the end of physical address
space, which may be a valid use case (especially on 32-bit systems).
This patch fixes it by checking the last mapped address (instead of the
first address behind that) for overflow.
Fixes: b299cde245 ("drivers: char: mem: Check for address space wraparound with mmap()")
Reported-by: Nico Huber <nico.h@gmx.de>
Signed-off-by: Julius Werner <jwerner@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 0c41baaa2d63..9a903511b357 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -332,7 +332,7 @@ static int mmap_mem(struct file *file, struct vm_area_struct *vma) 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) + if (offset + (phys_addr_t)size - 1 < offset) return -EINVAL; if (!valid_mmap_phys_addr_range(vma->vm_pgoff, size)) |