lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: Ensure clean slate when starting and stopping HDCP

Browse Source 
The DP HDCP layer fails to wait on and clear its internal thread
upon an HDCP stop or failure. This can result in use after free
failures if a read or write over aux channel operation is already
queued.

Update the DP HDCP layer to stop and wait on kthread completion
upon HDCP failures, and clear the kthread command queue before
resuming kthread execution. Additionally, ensure the SDE HDCP
worker thread correctly starts and stops execution upon HDCP
enablement and disablement respectively.

Change-Id: I4218d7935f89416b5e5d74afd8f5d22e031b9a38
Signed-off-by: Christopher Braga <cbraga@codeaurora.org>
This commit is contained in:
Christopher Braga 2019-05-02 18:04:44 -04:00
parent c24090b2c5
commit 7e9b80092b
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msm/dp/dp_display.c
View File

@ -382,12 +382,12 @@ static void dp_display_hdcp_cb_work(struct work_struct *work)
return;
}
dp_display_hdcp_register_streams(dp);
status->hdcp_state = HDCP_STATE_AUTHENTICATING;
if (ops && ops->reauthenticate) {
rc = ops->reauthenticate(data);
if (rc)
pr_err("failed rc=%d\n", rc);
}
status->hdcp_state = HDCP_STATE_AUTHENTICATING;
} else {
pr_debug("not reauthenticating, cable disconnected\n");
}

10
msm/dp/dp_hdcp2p2.c
View File

@ -196,16 +196,20 @@ static int dp_hdcp2p2_wakeup(struct hdcp_transport_wakeup_data *data)
switch (data->cmd) {
case HDCP_TRANSPORT_CMD_STATUS_SUCCESS:
atomic_set(&ctrl->auth_state, HDCP_STATE_AUTHENTICATED);
kfifo_put(&ctrl->cmd_q, data->cmd);
wake_up(&ctrl->wait_q);
break;
case HDCP_TRANSPORT_CMD_STATUS_FAILED:
atomic_set(&ctrl->auth_state, HDCP_STATE_AUTH_FAIL);
kfifo_put(&ctrl->cmd_q, data->cmd);
kthread_park(ctrl->thread);
break;
default:
kfifo_put(&ctrl->cmd_q, data->cmd);
wake_up(&ctrl->wait_q);
break;
}
kfifo_put(&ctrl->cmd_q, data->cmd);
wake_up(&ctrl->wait_q);
exit:
return 0;
}
@ -310,6 +314,8 @@ static int dp_hdcp2p2_authenticate(void *input)
ctrl->sink_status = SINK_CONNECTED;
atomic_set(&ctrl->auth_state, HDCP_STATE_AUTHENTICATING);
kthread_park(ctrl->thread);
kfifo_reset(&ctrl->cmd_q);
kthread_unpark(ctrl->thread);
cdata.context = input;

9
msm/sde_hdcp_2x.c
View File

@ -829,9 +829,16 @@ static int sde_hdcp_2x_wakeup(struct sde_hdcp_2x_wakeup_data *data)
if (!atomic_cmpxchg(&hdcp->enable_pending, 0, 1)) {
hdcp->device_type = data->device_type;
kfifo_put(&hdcp->cmd_q, data->cmd);
kthread_unpark(hdcp->thread);
wake_up(&hdcp->wait_q);
}
break;
case HDCP_2X_CMD_DISABLE:
if (!atomic_xchg(&hdcp->hdcp_off, 1))
kfifo_put(&hdcp->cmd_q, HDCP_2X_CMD_STOP);
kfifo_put(&hdcp->cmd_q, data->cmd);
kthread_park(hdcp->thread);
break;
case HDCP_2X_CMD_STOP:
atomic_set(&hdcp->hdcp_off, 1);
@ -926,8 +933,6 @@ static int sde_hdcp_2x_main(void *data)
atomic_set(&hdcp->enable_pending, 0);
break;
case HDCP_2X_CMD_DISABLE:
if (!atomic_xchg(&hdcp->hdcp_off, 1))
sde_hdcp_2x_clean(hdcp);
sde_hdcp_2x_disable(hdcp);
break;
case HDCP_2X_CMD_START: