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

Commit 7e5dbf0a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: Resolve use after free in listen sound client"

parents 6a5b4fc1 f10c5fa0

asoc/msm-lsm-client.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -2112,6 +2112,7 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream, 
	case SNDRV_LSM_GET_MODULE_PARAMS_32: {

	case SNDRV_LSM_GET_MODULE_PARAMS_32: {

		struct lsm_params_get_info_32 p_info_32, *param_info_rsp = NULL;

		struct lsm_params_get_info_32 p_info_32, *param_info_rsp = NULL;

		struct lsm_params_get_info *p_info = NULL;

		struct lsm_params_get_info *p_info = NULL;

		prtd->lsm_client->get_param_payload = NULL;





		memset(&p_info_32, 0 , sizeof(p_info_32));

		memset(&p_info_32, 0 , sizeof(p_info_32));

		if (!prtd->lsm_client->use_topology) {

		if (!prtd->lsm_client->use_topology) {
@@ -2162,6 +2163,7 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream, 
				__func__, err);

				__func__, err);

			kfree(p_info);

			kfree(p_info);

			kfree(prtd->lsm_client->get_param_payload);

			kfree(prtd->lsm_client->get_param_payload);

			prtd->lsm_client->get_param_payload = NULL;

			goto done;

			goto done;

		}

		}
@@ -2172,6 +2174,7 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream, 
			err = -ENOMEM;

			err = -ENOMEM;

			kfree(p_info);

			kfree(p_info);

			kfree(prtd->lsm_client->get_param_payload);

			kfree(prtd->lsm_client->get_param_payload);

			prtd->lsm_client->get_param_payload = NULL;

			goto done;

			goto done;

		}

		}
@@ -2196,6 +2199,7 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream, 
		kfree(p_info);

		kfree(p_info);

		kfree(param_info_rsp);

		kfree(param_info_rsp);

		kfree(prtd->lsm_client->get_param_payload);

		kfree(prtd->lsm_client->get_param_payload);

		prtd->lsm_client->get_param_payload = NULL;

		break;

		break;

	}

	}

	case SNDRV_LSM_REG_SND_MODEL_V2:

	case SNDRV_LSM_REG_SND_MODEL_V2:
@@ -2407,6 +2411,7 @@ static int msm_lsm_ioctl(struct snd_pcm_substream *substream, 




	case SNDRV_LSM_GET_MODULE_PARAMS: {

	case SNDRV_LSM_GET_MODULE_PARAMS: {

		struct lsm_params_get_info temp_p_info, *p_info = NULL;

		struct lsm_params_get_info temp_p_info, *p_info = NULL;

		prtd->lsm_client->get_param_payload = NULL;





		memset(&temp_p_info, 0, sizeof(temp_p_info));

		memset(&temp_p_info, 0, sizeof(temp_p_info));

		if (!prtd->lsm_client->use_topology) {

		if (!prtd->lsm_client->use_topology) {
@@ -2478,6 +2483,7 @@ static int msm_lsm_ioctl(struct snd_pcm_substream *substream, 
free:

free:

		kfree(p_info);

		kfree(p_info);

		kfree(prtd->lsm_client->get_param_payload);

		kfree(prtd->lsm_client->get_param_payload);

		prtd->lsm_client->get_param_payload = NULL;

		break;

		break;

	}

	}

	case SNDRV_LSM_EVENT_STATUS:

	case SNDRV_LSM_EVENT_STATUS: