Merge "dsp: Fix issues due to accessing array out of bounds" (f2a60c74) · Commits · e / devices / android_kernel_oneplus_sm7250

dsp/rtac.c

+13 −1

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.		* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
	*/		*/

	#include <linux/fs.h>		#include <linux/fs.h>
	@@ -957,6 +957,12 @@ void rtac_set_asm_handle(u32 session_id, void *handle)
	{		{
	pr_debug("%s\n", __func__);		pr_debug("%s\n", __func__);

			if (session_id >= (ASM_ACTIVE_STREAMS_ALLOWED + 1)) {
			pr_err_ratelimited("%s: Invalid Session = %d\n",
			__func__, session_id);
			return;
			}

	mutex_lock(&rtac_asm_apr_mutex);		mutex_lock(&rtac_asm_apr_mutex);
	rtac_asm_apr_data[session_id].apr_handle = handle;		rtac_asm_apr_data[session_id].apr_handle = handle;
	mutex_unlock(&rtac_asm_apr_mutex);		mutex_unlock(&rtac_asm_apr_mutex);
	@@ -965,6 +971,12 @@ void rtac_set_asm_handle(u32 session_id, void *handle)
	bool rtac_make_asm_callback(u32 session_id, uint32_t *payload,		bool rtac_make_asm_callback(u32 session_id, uint32_t *payload,
	u32 payload_size)		u32 payload_size)
	{		{
			if (session_id >= (ASM_ACTIVE_STREAMS_ALLOWED + 1)) {
			pr_err_ratelimited("%s: Invalid Session = %d\n",
			__func__, session_id);
			return false;
			}

	if (atomic_read(&rtac_asm_apr_data[session_id].cmd_state) != 1)		if (atomic_read(&rtac_asm_apr_data[session_id].cmd_state) != 1)
	return false;		return false;