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

Commit 9786e58d authored by Neeti Desai's avatar Neeti Desai Committed by David Ng
Browse files

Revert "staging: android: binder: modify struct binder_write_read to use size_t" 



This reverts commit 5a04a150.

Change-Id: I6f4f07dd1715095fdccbe0dcc84aba805856b2ff
Signed-off-by: default avatarNeeti Desai <neetid@codeaurora.org>
Signed-off-by: default avatarAjay Dudani <adudani@codeaurora.org>
parent 06bc419b

drivers/staging/android/binder.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1722,7 +1722,7 @@ err_no_context_mgr_node: 
}

}





int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,

int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,

			void __user *buffer, size_t size, size_t *consumed)

			void __user *buffer, int size, signed long *consumed)

{

{

	uint32_t cmd;

	uint32_t cmd;

	void __user *ptr = buffer + *consumed;

	void __user *ptr = buffer + *consumed;
@@ -2109,8 +2109,8 @@ static int binder_has_thread_work(struct binder_thread *thread) 




static int binder_thread_read(struct binder_proc *proc,

static int binder_thread_read(struct binder_proc *proc,

			      struct binder_thread *thread,

			      struct binder_thread *thread,

			      void  __user *buffer, size_t size,

			      void  __user *buffer, int size,

			      size_t *consumed, int non_block)

			      signed long *consumed, int non_block)

{

{

	void __user *ptr = buffer + *consumed;

	void __user *ptr = buffer + *consumed;

	void __user *end = buffer + size;

	void __user *end = buffer + size;
@@ -2607,7 +2607,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
			goto err;

			goto err;

		}

		}

		binder_debug(BINDER_DEBUG_READ_WRITE,

		binder_debug(BINDER_DEBUG_READ_WRITE,

			     "%d:%d write %zd at %08lx, read %zd at %08lx\n",

			     "%d:%d write %ld at %08lx, read %ld at %08lx\n",

			     proc->pid, thread->pid, bwr.write_size,

			     proc->pid, thread->pid, bwr.write_size,

			     bwr.write_buffer, bwr.read_size, bwr.read_buffer);

			     bwr.write_buffer, bwr.read_size, bwr.read_buffer);
@@ -2633,7 +2633,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
			}

			}

		}

		}

		binder_debug(BINDER_DEBUG_READ_WRITE,

		binder_debug(BINDER_DEBUG_READ_WRITE,

			     "%d:%d wrote %zd of %zd, read return %zd of %zd\n",

			     "%d:%d wrote %ld of %ld, read return %ld of %ld\n",

			     proc->pid, thread->pid, bwr.write_consumed, bwr.write_size,

			     proc->pid, thread->pid, bwr.write_consumed, bwr.write_size,

			     bwr.read_consumed, bwr.read_size);

			     bwr.read_consumed, bwr.read_size);

		if (copy_to_user(ubuf, &bwr, sizeof(bwr))) {

		if (copy_to_user(ubuf, &bwr, sizeof(bwr))) {

drivers/staging/android/binder.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -67,11 +67,11 @@ struct flat_binder_object { 
 */

 */





struct binder_write_read {

struct binder_write_read {

	size_t write_size;	/* bytes to write */

	signed long	write_size;	/* bytes to write */

	size_t write_consumed;	/* bytes consumed by driver */

	signed long	write_consumed;	/* bytes consumed by driver */

	unsigned long	write_buffer;

	unsigned long	write_buffer;

	size_t read_size;	/* bytes to read */

	signed long	read_size;	/* bytes to read */

	size_t read_consumed;	/* bytes consumed by driver */

	signed long	read_consumed;	/* bytes consumed by driver */

	unsigned long	read_buffer;

	unsigned long	read_buffer;

};

};