DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ashmem: Fix ASHMEM_SET_PROT_MASK.

Browse Source 
Change-Id: I1412cc9560de8c4feb1162fc30922f0e3362a476
Signed-off-by: Arve Hjønnevåg <arve@android.com>
This commit is contained in:
Arve Hjønnevåg
2010-07-15 16:31:16 -07:00
committed by Colin Cross
parent be17d1d867
commit f6db96177f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mm/ashmem.c
View File

@@ -236,6 +236,14 @@ out:
return ret; return ret;
} }
static inline unsigned long
calc_vm_may_flags(unsigned long prot)
{
return _calc_vm_trans(prot, PROT_READ, VM_MAYREAD ) |
_calc_vm_trans(prot, PROT_WRITE, VM_MAYWRITE) |
_calc_vm_trans(prot, PROT_EXEC, VM_MAYEXEC);
}
static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)
{ {
struct ashmem_area *asma = file->private_data; struct ashmem_area *asma = file->private_data;
@@ -250,10 +258,12 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)
} }
/* requested protection bits must match our allowed protection mask */ /* requested protection bits must match our allowed protection mask */
if (unlikely((vma->vm_flags & ~asma->prot_mask) & PROT_MASK)) { if (unlikely((vma->vm_flags & ~calc_vm_prot_bits(asma->prot_mask)) &
calc_vm_prot_bits(PROT_MASK))) {
ret = -EPERM; ret = -EPERM;
goto out; goto out;
} }
vma->vm_flags &= ~calc_vm_may_flags(~asma->prot_mask);
if (!asma->file) { if (!asma->file) {
char *name = ASHMEM_NAME_DEF; char *name = ASHMEM_NAME_DEF;