Merge tag 'LA.UM.9.14.1.r1-21700-QCM6490.QISI15.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into HEAD

"LA.UM.9.14.1.r1-21700-QCM6490.QISI15.0"

* tag 'LA.UM.9.14.1.r1-21700-QCM6490.QISI15.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  msm:adsprpc: Fix UAF of ctx->perf in async invoke perf counter
  tty: msm: Update timer handling for interrupt-safe context

Change-Id: I41d7a1f4826c1ea9578cb8e04fff517e72422a2d
This commit is contained in:
Nolen Johnson 2026-08-10 17:09:14 -04:00
commit 7692046155
2 changed files with 21 additions and 5 deletions

View file

@ -2684,7 +2684,7 @@ static int msm_hs_startup(struct uart_port *uport)
tx->dma_in_flight = false;
MSM_HS_DBG("%s():desc usage flag 0x%lx\n", __func__, rx->queued_flag);
timer_setup(&(tx->tx_timeout_timer),
tx_timeout_handler, 0);
tx_timeout_handler, TIMER_IRQSAFE);
/* Enable reading the current CTS, no harm even if CTS is ignored */
msm_uport->imr_reg |= UARTDM_ISR_CURRENT_CTS_BMSK;