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

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

Merge "msm: adsprpc: Fix compat ioctl invoke failure"

parents 82773f90 2930998f

drivers/char/adsprpc_compat.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -156,7 +156,7 @@ struct compat_fastrpc_ioctl_dsp_capabilities { 
static int compat_get_fastrpc_ioctl_invoke(

static int compat_get_fastrpc_ioctl_invoke(

			struct compat_fastrpc_ioctl_invoke_crc __user *inv32,

			struct compat_fastrpc_ioctl_invoke_crc __user *inv32,

			struct fastrpc_ioctl_invoke_crc __user **inva,

			struct fastrpc_ioctl_invoke_crc __user **inva,

			unsigned int cmd, unsigned int sc)

			unsigned int cmd, compat_uint_t sc)

{

{

	compat_uint_t u;

	compat_uint_t u;

	compat_size_t s;

	compat_size_t s;
@@ -520,14 +520,14 @@ long compat_fastrpc_device_ioctl(struct file *filp, unsigned int cmd, 
	case COMPAT_FASTRPC_IOCTL_INVOKE_ATTRS:

	case COMPAT_FASTRPC_IOCTL_INVOKE_ATTRS:

	case COMPAT_FASTRPC_IOCTL_INVOKE_CRC:

	case COMPAT_FASTRPC_IOCTL_INVOKE_CRC:

	{

	{

		struct compat_fastrpc_ioctl_invoke_crc __user *inv32;

		struct compat_fastrpc_ioctl_invoke_crc __user *inv32 = NULL;

		struct fastrpc_ioctl_invoke_crc __user *inv;

		struct fastrpc_ioctl_invoke_crc __user *inv = NULL;





		inv32 = compat_ptr(arg);

		err = get_user(sc, &inv32->inv.sc);

		err = get_user(sc, &inv32->inv.sc);

		if (err)

		if (err)

			return err;

			return err;





		inv32 = compat_ptr(arg);

		VERIFY(err, 0 == compat_get_fastrpc_ioctl_invoke(inv32,

		VERIFY(err, 0 == compat_get_fastrpc_ioctl_invoke(inv32,

							&inv, cmd, sc));

							&inv, cmd, sc));

		if (err)

		if (err)