Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "asoc: fix error handling logic to avoid potential deadlock"

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-09 01:20:37 -07:00 • committed by Gerrit - the friendly Code Review server
commit 65538ee5e9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
asoc/msm-lsm-client.c
View file

@ -1368,7 +1368,8 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream,
if (copy_from_user(&userarg32, arg, sizeof(userarg32))) {
dev_err(rtd->dev, "%s: err copyuser ioctl %s\n",
__func__, "SNDRV_LSM_EVENT_STATUS_V3_32");
return -EFAULT;
err = -EINVAL;
goto done;
}
if (userarg32.payload_size >
@ -1376,7 +1377,8 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream,
pr_err("%s: payload_size %d is invalid, max allowed = %d\n",
__func__, userarg32.payload_size,
LISTEN_MAX_STATUS_PAYLOAD_SIZE);
return -EINVAL;
err = -EINVAL;
goto done;
}
size = sizeof(*user) + userarg32.payload_size;
@ -1385,7 +1387,8 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream,
dev_err(rtd->dev,
"%s: Allocation failed event status size %d\n",
__func__, size);
return -EFAULT;
err = -ENOMEM;
goto done;
}
cmd = SNDRV_LSM_EVENT_STATUS_V3;
user->payload_size = userarg32.payload_size;