diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 19:11:28 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 19:11:28 -0500 |
| commit | 138a6d7ea2deb3080116a4f99019e181b62e5ce5 (patch) | |
| tree | 424622059405352935fbf1dde015a1e130b56198 /drivers/uio | |
| parent | 4fc6069e7df873bda9baabe0fa9f0be23363159a (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge 3.13-rc4 into char-misc-next
We want these fixes in here.
Diffstat (limited to 'drivers/uio')
| -rw-r--r-- | drivers/uio/uio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index 67beb8444930..f7beb6eb40c7 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c | |||
| @@ -653,6 +653,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma) | |||
| 653 | return -EINVAL; | 653 | return -EINVAL; |
| 654 | mem = idev->info->mem + mi; | 654 | mem = idev->info->mem + mi; |
| 655 | 655 | ||
| 656 | if (mem->addr & ~PAGE_MASK) | ||
| 657 | return -ENODEV; | ||
| 656 | if (vma->vm_end - vma->vm_start > mem->size) | 658 | if (vma->vm_end - vma->vm_start > mem->size) |
| 657 | return -EINVAL; | 659 | return -EINVAL; |
| 658 | 660 | ||