diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2018-01-17 17:42:22 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2018-01-17 17:42:22 +0530 |
| commit | 8a848eb9e2cb9e8ac72484de6477c0a748d294b0 (patch) | |
| tree | 688519f5af4dd7c17877b9c344bb8f01d88f98ed /drivers/staging/android/ashmem.c | |
| parent | d09a3b11141326b583eaf31fd40e12ac3e8377e6 (diff) | |
| parent | 42375c1120d5c90d7469ba264fb124f728b1a4f7 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.112-hikey
Diffstat (limited to 'drivers/staging/android/ashmem.c')
| -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 9c6357c03905..b64327722660 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -759,10 +759,12 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; case ASHMEM_SET_SIZE: ret = -EINVAL; + mutex_lock(&ashmem_mutex); if (!asma->file) { ret = 0; asma->size = (size_t)arg; } + mutex_unlock(&ashmem_mutex); break; case ASHMEM_GET_SIZE: ret = asma->size; |