diff options
author | Viktor Slavkovic <viktors@google.com> | 2018-01-08 13:43:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-09 09:32:11 -0500 |
commit | 443064cb0b1fb4569fe0a71209da7625129fb760 (patch) | |
tree | 677f623bbda77dd2fddb27de05169668d250e0cd | |
parent | 30a7acd573899fd8b8ac39236eff6468b195ac7d (diff) |
staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctl
A lock-unlock is missing in ASHMEM_SET_SIZE ioctl which can result in a
race condition when mmap is called. After the !asma->file check, before
setting asma->size, asma->file can be set in mmap. That would result in
having different asma->size than the mapped memory size. Combined with
ASHMEM_UNPIN ioctl and shrinker invocation, this can result in memory
corruption.
Signed-off-by: Viktor Slavkovic <viktors@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/android/ashmem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 0f695df14c9d..372ce9913e6d 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c | |||
@@ -765,10 +765,12 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
765 | break; | 765 | break; |
766 | case ASHMEM_SET_SIZE: | 766 | case ASHMEM_SET_SIZE: |
767 | ret = -EINVAL; | 767 | ret = -EINVAL; |
768 | mutex_lock(&ashmem_mutex); | ||
768 | if (!asma->file) { | 769 | if (!asma->file) { |
769 | ret = 0; | 770 | ret = 0; |
770 | asma->size = (size_t)arg; | 771 | asma->size = (size_t)arg; |
771 | } | 772 | } |
773 | mutex_unlock(&ashmem_mutex); | ||
772 | break; | 774 | break; |
773 | case ASHMEM_GET_SIZE: | 775 | case ASHMEM_GET_SIZE: |
774 | ret = asma->size; | 776 | ret = asma->size; |