Merge "adsprpc: validate VMID before hyp_assign during unmap" (04c2a7a2) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/char/adsprpc.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -2041,13 +2041,16 @@ static int fastrpc_munmap_on_dsp_rh(struct fastrpc_file *fl,
		err = scm_call2(SCM_SIP_FNID(SCM_SVC_PIL,
		TZ_PIL_CLEAR_PROTECT_MEM_SUBSYS_ID), &desc);
		} else if (map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR) {
		VERIFY(err, !hyp_assign_phys(map->phys, (uint64_t)map->size,
		if (me->channel[fl->cid].rhvm.vmid) {
		VERIFY(err, !hyp_assign_phys(map->phys,
		(uint64_t)map->size,
		me->channel[fl->cid].rhvm.vmid,
		me->channel[fl->cid].rhvm.vmcount,
		destVM, destVMperm, 1));
		if (err)
		goto bail;
		}
		}

		bail:
		return err;