Merge "staging: android: binder: modify struct binder_write_read to use size_t" (1e577c1a) · Commits · e / devices / android_kernel_sony_msm8994

drivers/staging/android/binder.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1719,7 +1719,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, int size, signed long consumed)		void __user buffer, size_t size, size_t consumed)
	{		{
	uint32_t cmd;		uint32_t cmd;
	void __user ptr = buffer + consumed;		void __user ptr = buffer + consumed;
	@@ -2099,8 +2099,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, int size,		void __user *buffer, size_t size,
	signed long *consumed, int non_block)		size_t *consumed, int non_block)
	{		{
	void __user ptr = buffer + consumed;		void __user ptr = buffer + consumed;
	void __user *end = buffer + size;		void __user *end = buffer + size;
	@@ -2597,7 +2597,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 %ld at %08lx, read %ld at %08lx\n",		"%d:%d write %zd at %08lx, read %zd 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);

	@@ -2623,7 +2623,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 %ld of %ld, read return %ld of %ld\n",		"%d:%d wrote %zd of %zd, read return %zd of %zd\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 {
	signed long write_size; /* bytes to write */		size_t write_size; /* bytes to write */
	signed long write_consumed; /* bytes consumed by driver */		size_t write_consumed; /* bytes consumed by driver */
	unsigned long write_buffer;		unsigned long write_buffer;
	signed long read_size; /* bytes to read */		size_t read_size; /* bytes to read */
	signed long read_consumed; /* bytes consumed by driver */		size_t read_consumed; /* bytes consumed by driver */
	unsigned long read_buffer;		unsigned long read_buffer;
	};		};