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

Commit 48be0c64 authored by Tharun Kumar Merugu's avatar Tharun Kumar Merugu
Browse files

adsprpc: validate VMID before hyp_assign during unmap 



Validate VMID before doing hyp_assign_phys during unmap on DSP.

Change-Id: I9c41416c9df12bd993bff59378ea66d31cda3686
Acked-by: default avatarThyagarajan Venkatanarayanan <venkatan@qti.qualcomm.com>
Signed-off-by: default avatarTharun Kumar Merugu <mtharu@codeaurora.org>
parent 4cec0cd6

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;