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

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

Merge "msm: vidc: Cancel userptr validation during secure decode"

parents 2b344102 c3b815d7

drivers/media/platform/msm/vidc/msm_vidc.c

+1 −1
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ int msm_vidc_dqbuf(void *instance, struct v4l2_buffer *b) 
		b->m.planes[i].m.userptr = buffer_info->uvaddr[i];

		b->m.planes[i].reserved[0] = buffer_info->fd[i];

		b->m.planes[i].reserved[1] = buffer_info->buff_off[i];

		if (!b->m.planes[i].m.userptr) {

		if (!(inst->flags & VIDC_SECURE) && !b->m.planes[i].m.userptr) {

			dprintk(VIDC_ERR,

			"%s: Failed to find user virtual address, %#lx, %d, %d\n",

			__func__, b->m.planes[i].m.userptr, b->type, i);