Merge "ASoC: msm: fix a use after free problem in audio_calibration" (d6207ed1) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/audio_calibration.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -355,7 +355,7 @@ static long audio_cal_shared_ioctl(struct file *file, unsigned int cmd,
		{
		int ret = 0;
		int32_t size;
		struct audio_cal_basic *data;
		struct audio_cal_basic *data = NULL;
		pr_debug("%s\n", __func__);

		switch (cmd) {
		@@ -458,9 +458,9 @@ static long audio_cal_shared_ioctl(struct file *file, unsigned int cmd,
		}

		unlock:
		kfree(data);
		mutex_unlock(&audio_cal.cal_mutex[data->hdr.cal_type]);
		done:
		kfree(data);
		return ret;
		}