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

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

Revert "staging: android: binder: fix binder interface for 64bit compat layer" 



This reverts commit c7eb3fd6.

Change-Id: I1520162f38b7bd27596b111f6b159c494fcf77c5
Signed-off-by: default avatarNeeti Desai <neetid@codeaurora.org>
Signed-off-by: default avatarAjay Dudani <adudani@codeaurora.org>
parent 29ae05cb

drivers/staging/android/binder.c

+10 −10
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, 
		case BINDER_TYPE_WEAK_HANDLE: {

			struct binder_ref *ref = binder_get_ref(proc, fp->handle);

			if (ref == NULL) {

				pr_err("transaction release %d bad handle %d\n",

				pr_err("transaction release %d bad handle %ld\n",

				 debug_id, fp->handle);

				break;

			}
@@ -1288,13 +1288,13 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, 


		case BINDER_TYPE_FD:

			binder_debug(BINDER_DEBUG_TRANSACTION,

				     "        fd %d\n", fp->handle);

				     "        fd %ld\n", fp->handle);

			if (failed_at)

				task_close_fd(proc, fp->handle);

			break;



		default:

			pr_err("transaction release %d bad object type %x\n",

			pr_err("transaction release %d bad object type %lx\n",

				debug_id, fp->type);

			break;

		}
@@ -1560,7 +1560,7 @@ static void binder_transaction(struct binder_proc *proc, 
		case BINDER_TYPE_WEAK_HANDLE: {

			struct binder_ref *ref = binder_get_ref(proc, fp->handle);

			if (ref == NULL) {

				binder_user_error("%d:%d got transaction with invalid handle, %d\n",

				binder_user_error("%d:%d got transaction with invalid handle, %ld\n",

						proc->pid,

						thread->pid, fp->handle);

				return_error = BR_FAILED_REPLY;
@@ -1607,13 +1607,13 @@ static void binder_transaction(struct binder_proc *proc, 


			if (reply) {

				if (!(in_reply_to->flags & TF_ACCEPT_FDS)) {

					binder_user_error("%d:%d got reply with fd, %d, but target does not allow fds\n",

					binder_user_error("%d:%d got reply with fd, %ld, but target does not allow fds\n",

						proc->pid, thread->pid, fp->handle);

					return_error = BR_FAILED_REPLY;

					goto err_fd_not_allowed;

				}

			} else if (!target_node->accept_fds) {

				binder_user_error("%d:%d got transaction with fd, %d, but target does not allow fds\n",

				binder_user_error("%d:%d got transaction with fd, %ld, but target does not allow fds\n",

					proc->pid, thread->pid, fp->handle);

				return_error = BR_FAILED_REPLY;

				goto err_fd_not_allowed;
@@ -1621,7 +1621,7 @@ static void binder_transaction(struct binder_proc *proc, 


			file = fget(fp->handle);

			if (file == NULL) {

				binder_user_error("%d:%d got transaction with invalid fd, %d\n",

				binder_user_error("%d:%d got transaction with invalid fd, %ld\n",

					proc->pid, thread->pid, fp->handle);

				return_error = BR_FAILED_REPLY;

				goto err_fget_failed;
@@ -1640,13 +1640,13 @@ static void binder_transaction(struct binder_proc *proc, 
			task_fd_install(target_proc, target_fd, file);

			trace_binder_transaction_fd(t, fp->handle, target_fd);

			binder_debug(BINDER_DEBUG_TRANSACTION,

				     "        fd %d -> %d\n", fp->handle, target_fd);

				     "        fd %ld -> %d\n", fp->handle, target_fd);

			/* TODO: fput? */

			fp->handle = target_fd;

		} break;



		default:

			binder_user_error("%d:%d got transaction with invalid object type, %x\n",

			binder_user_error("%d:%d got transaction with invalid object type, %lx\n",

				proc->pid, thread->pid, fp->type);

			return_error = BR_FAILED_REPLY;

			goto err_bad_object_type;
@@ -2607,7 +2607,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
			goto err;

		}

		binder_debug(BINDER_DEBUG_READ_WRITE,

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

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

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

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

drivers/staging/android/binder.h

+6 −6
Original line number Diff line number Diff line
@@ -48,13 +48,13 @@ enum { 
 */

struct flat_binder_object {

	/* 8 bytes for large_flat_header. */

	__u32		type;

	__u32		flags;

	unsigned long		type;

	unsigned long		flags;



	/* 8 bytes of data. */

	union {

		void __user	*binder;	/* local object */

		__u32	    handle;		/* remote object */

		signed long	handle;		/* remote object */

	};



	/* extra data associated with local object */
@@ -78,7 +78,7 @@ struct binder_write_read { 
/* Use with BINDER_VERSION, driver fills in fields. */

struct binder_version {

	/* driver protocol version -- increment with incompatible change */

	__s32       protocol_version;

	signed long	protocol_version;

};



/* This is the current protocol version. */
@@ -119,7 +119,7 @@ struct binder_transaction_data { 
	 * identifying the target and contents of the transaction.

	 */

	union {

		__u32	handle;	/* target descriptor of command transaction */

		size_t	handle;	/* target descriptor of command transaction */

		void	*ptr;	/* target descriptor of return transaction */

	} target;

	void		*cookie;	/* target object cookie */
@@ -154,7 +154,7 @@ struct binder_ptr_cookie { 


struct binder_pri_desc {

	__s32 priority;

	__u32 desc;

	__s32 desc;

};



struct binder_pri_ptr_cookie {