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

Commit a2c4ce62 authored by Tharun Kumar Merugu's avatar Tharun Kumar Merugu
Browse files

msm: ADSPRPC: handle 32 bit support 



Handle 32 bit support without truncation.

Change-Id: I158271b8fefd74f1d01fb79ddef89982078d3fee
Acked-by: default avatarKrishnaiah Tadakamalla <ktadakam@qti.qualcomm.com>
Signed-off-by: default avatarTharun Kumar Merugu <mtharu@codeaurora.org>
parent 0e6e8a2a

drivers/char/adsprpc_compat.c

+8 −8
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -77,13 +77,13 @@ struct compat_fastrpc_ioctl_invoke_crc { 
struct compat_fastrpc_ioctl_mmap {

	compat_int_t fd;	/* ion fd */

	compat_uint_t flags;	/* flags for dsp to map with */

	compat_uptr_t vaddrin;	/* optional virtual address */

	compat_u64 vaddrin;	/* optional virtual address */

	compat_size_t size;	/* size */

	compat_uptr_t vaddrout;	/* dsps virtual address */

	compat_u64 vaddrout;	/* dsps virtual address */

};



struct compat_fastrpc_ioctl_munmap {

	compat_uptr_t vaddrout;	/* address to unmap */

	compat_u64 vaddrout;	/* address to unmap */

	compat_size_t size;	/* size */

};
@@ -191,7 +191,7 @@ static int compat_get_fastrpc_ioctl_mmap( 
	compat_uint_t u;

	compat_int_t i;

	compat_size_t s;

	compat_uptr_t p;

	compat_u64 p;

	int err;



	err = get_user(i, &map32->fd);
@@ -199,7 +199,7 @@ static int compat_get_fastrpc_ioctl_mmap( 
	err |= get_user(u, &map32->flags);

	err |= put_user(u, &map->flags);

	err |= get_user(p, &map32->vaddrin);

	err |= put_user(p, (uintptr_t *)&map->vaddrin);

	err |= put_user(p, &map->vaddrin);

	err |= get_user(s, &map32->size);

	err |= put_user(s, &map->size);
@@ -210,7 +210,7 @@ static int compat_put_fastrpc_ioctl_mmap( 
			struct compat_fastrpc_ioctl_mmap __user *map32,

			struct fastrpc_ioctl_mmap __user *map)

{

	compat_uptr_t p;

	compat_u64 p;

	int err;



	err = get_user(p, &map->vaddrout);
@@ -223,7 +223,7 @@ static int compat_get_fastrpc_ioctl_munmap( 
			struct compat_fastrpc_ioctl_munmap __user *unmap32,

			struct fastrpc_ioctl_munmap __user *unmap)

{

	compat_uptr_t p;

	compat_u64 p;

	compat_size_t s;

	int err;

drivers/char/adsprpc_shared.h

+3 −3
Original line number Diff line number Diff line
@@ -199,16 +199,16 @@ struct fastrpc_ioctl_init_attrs { 
};



struct fastrpc_ioctl_munmap {

	uintptr_t vaddrout;	/* address to unmap */

	uint64_t vaddrout;	/* address to unmap */

	size_t size;		/* size */

};



struct fastrpc_ioctl_mmap {

	int fd;				/* ion fd */

	uint32_t flags;			/* flags for dsp to map with */

	uintptr_t vaddrin;		/* optional virtual address */

	uint64_t vaddrin;		/* optional virtual address */

	size_t size;			/* size */

	uintptr_t vaddrout;		/* dsps virtual address */

	uint64_t vaddrout;		/* dsps virtual address */

};



struct fastrpc_ioctl_munmap_fd {