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

Commit fe9ca659 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "staging: android: binder: fix alignment issues""

parents 608460d2 06bc419b

drivers/staging/android/binder.c

+2 −2
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, 
		struct flat_binder_object *fp;

		if (*offp > buffer->data_size - sizeof(*fp) ||

		    buffer->data_size < sizeof(*fp) ||

		    !IS_ALIGNED(*offp, sizeof(u32))) {

		    !IS_ALIGNED(*offp, sizeof(void *))) {

			pr_err("transaction release %d bad offset %zd, size %zd\n",

			 debug_id, *offp, buffer->data_size);

			continue;
@@ -1505,7 +1505,7 @@ static void binder_transaction(struct binder_proc *proc, 
		struct flat_binder_object *fp;

		if (*offp > t->buffer->data_size - sizeof(*fp) ||

		    t->buffer->data_size < sizeof(*fp) ||

		    !IS_ALIGNED(*offp, sizeof(u32))) {

		    !IS_ALIGNED(*offp, sizeof(void *))) {

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

					proc->pid, thread->pid, *offp);

			return_error = BR_FAILED_REPLY;