Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56f76fc6 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Greg Kroah-Hartman
Browse files

ashmem: Fix ASHMEM_SET_PROT_MASK. 



Signed-off-by: default avatarArve Hjønnevåg <arve@android.com>
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 853ca7ae

drivers/staging/android/ashmem.c

+10 −1
Original line number Diff line number Diff line
@@ -236,6 +236,13 @@ static ssize_t ashmem_read(struct file *file, char __user *buf, 
	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)

{
@@ -251,10 +258,12 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) 
	}



	/* 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;

		goto out;

	}

	vma->vm_flags &= ~calc_vm_may_flags(~asma->prot_mask);



	if (!asma->file) {

		char *name = ASHMEM_NAME_DEF;