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

Unverified Commit be221a6a authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.12.r1-16200-SMxx50.QSSI12.0' of... 

Merge tag 'LA.UM.9.12.r1-16200-SMxx50.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/audio-kernel into android13-4.19-kona

"LA.UM.9.12.r1-16200-SMxx50.QSSI12.0"

* tag 'LA.UM.9.12.r1-16200-SMxx50.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/audio-kernel:
  dsp: add lock in ion free to avoid use after free
  ASoC: Resolve use after free in listen sound client

 Conflicts:
	techpack/audio/dsp/msm_audio_ion.c

Change-Id: I44bcbc386cbfa2f6e3d1eef9b8bd1109d0df9b8c
parents 940cd040 c2452d9e

techpack/audio/dsp/msm_audio_ion.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2019, 2020, The Linux Foundation. All rights reserved.

 *

 * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.

 */
@@ -335,6 +335,7 @@ static int msm_audio_ion_buf_map(struct dma_buf *dma_buf, dma_addr_t *paddr, 
		mutex_lock(&(msm_audio_ion_data.list_mutex));

		msm_audio_dma_buf_unmap(dma_buf);

		mutex_unlock(&(msm_audio_ion_data.list_mutex));



		goto err;

	}