Merge "ASoC: msm: qdsp6v2: avoid null pointer dereference" (c66490db) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/msm-lsm-client.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -395,7 +395,7 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream,
		if (!user) {
		pr_err("%s: Allocation failed event status size %d\n",
		__func__, size);
		err = -EFAULT;
		return -EFAULT;
		} else {
		cmd = SNDRV_LSM_EVENT_STATUS;
		user->payload_size = userarg32.payload_size;
		@@ -556,7 +556,7 @@ static int msm_lsm_ioctl(struct snd_pcm_substream *substream,
		if (!user) {
		pr_err("%s: Allocation failed event status size %d\n",
		__func__, size);
		err = -EFAULT;
		return -EFAULT;
		} else {
		user->payload_size = userarg.payload_size;
		err = msm_lsm_ioctl_shared(substream, cmd, user);