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

Commit ccfa902b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "adsprpc: hyp assign only for valid VMIDs" into msm-4.14

parents 7602e342 0e118cf9

drivers/char/adsprpc.c

+12 −9
Original line number Diff line number Diff line
@@ -1842,17 +1842,20 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
				goto bail;

			phys = mem->phys;

			size = mem->size;

			VERIFY(err, !hyp_assign_phys(phys, (uint64_t)size,

				hlosvm, 1, me->channel[fl->cid].rhvm.vmid,

			if (me->channel[fl->cid].rhvm.vmid) {

				VERIFY(err, !hyp_assign_phys(phys,

					(uint64_t)size, hlosvm, 1,

					me->channel[fl->cid].rhvm.vmid,

					me->channel[fl->cid].rhvm.vmperm,

					me->channel[fl->cid].rhvm.vmcount));

				if (err) {

					pr_err("ADSPRPC: hyp_assign_phys fail err %d",

								 err);

				pr_err("map->phys %llx, map->size %d\n",

					pr_err("map->phys 0x%llx, map->size %d\n",

							 phys, (int)size);

					goto bail;

				}

			}

			me->staticpd_flags = 1;

		}