Merge tag 'LA.UM.9.15.2.r1-10600-KAMORTA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19 into android13-4.19-kona

"LA.UM.9.15.2.r1-10600-KAMORTA.QSSI14.0"

* tag 'LA.UM.9.15.2.r1-10600-KAMORTA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19:
  ii2c: i2c-master-msm-geni: add null pointer check in event call back
  msm-4.19: qseecom: Fix possible race condition
  adsprpc: Handle UAF scenario in put_args
  msm: adsprpc: use-after-free (UAF) in global maps
  soc: qcom: smem: Add boundary checks for partitions
  UPSTREAM: loop: unset GENHD_FL_NO_PART_SCAN on LOOP_CONFIGURE
  loop: Select I/O scheduler 'none' from inside add_disk()
  BACKPORT: loop: Fix missing discard support when using LOOP_CONFIGURE
  loop: Check for overflow while configuring loop
  BACKPORT: loop: Set correct device size when using LOOP_CONFIGURE
  block: delete part_round_stats and switch to less precise counting
  BACKPORT: media: venus: hfi: fix the check in session buffer requirement
  msm: adsprpc: Handle UAF in fastrpc internal munmap
  msm: kgsl: Keep postamble packets in a privileged buffer
  soc: qcom: qsee_ipc_irq_bridge: Remove redundant cleanup
  net: qrtr: fifo: Add bounds check on tx path

Change-Id: I1709553f1864cd481a3c7f385aa5a40573c13e51
This commit is contained in:
Michael Bestas
2024-10-10 14:41:43 +03:00
2 changed files with 85 additions and 32 deletions

View File

@@ -351,8 +351,16 @@ static irqreturn_t geni_i2c_irq(int irq, void *dev)
static void gi2c_ev_cb(struct dma_chan *ch, struct msm_gpi_cb const *cb_str,
void *ptr)
{
struct geni_i2c_dev *gi2c = ptr;
u32 m_stat = cb_str->status;
struct geni_i2c_dev *gi2c;
u32 m_stat;
if (!ptr || !cb_str) {
pr_err("%s: Invalid ev_cb buffer\n", __func__);
return;
}
gi2c = (struct geni_i2c_dev *)ptr;
m_stat = cb_str->status;
switch (cb_str->cb_event) {
case MSM_GPI_QUP_ERROR: