Merge "msm:adsprpc: Fix 32 bit error in capability API"

This commit is contained in:
qctecmdr 2020-06-08 17:54:15 -07:00 • committed by Gerrit - the friendly Code Review server
commit 38951e4b2f
2 changed files with 6 additions and 2 deletions

View file

@ -3595,7 +3595,7 @@ static int fastrpc_get_info_from_kernel(
* kernel
*/
if (cap->attribute_ID >= FASTRPC_MAX_ATTRIBUTES) {
err = EOVERFLOW;
err = -EOVERFLOW;
cap->capability = 0;
goto bail;
}

View file

@ -743,7 +743,7 @@ static int compat_fastrpc_get_dsp_info(struct file *filp,
unsigned long arg)
{
struct compat_fastrpc_ioctl_capability __user *info32;
struct fastrpc_ioctl_capability *info;
struct fastrpc_ioctl_capability __user *info;
compat_uint_t u;
long ret;
int err = 0;
@ -756,6 +756,10 @@ static int compat_fastrpc_get_dsp_info(struct file *filp,
err = get_user(u, &info32->domain);
err |= put_user(u, &info->domain);
err = get_user(u, &info32->attribute_ID);
err |= put_user(u, &info->attribute_ID);
if (err)
return err;