Merge "FROMLIST: android: binder: Fix null ptr dereference in debug msg" (abdb4aa5) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/android/binder_alloc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -560,7 +560,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc,
		binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
		"%d: merge free, buffer %pK do not share page with %pK or %pK\n",
		alloc->pid, buffer->data,
		prev->data, next->data);
		prev->data, next ? next->data : NULL);
		binder_update_page_range(alloc, 0, buffer_start_page(buffer),
		buffer_start_page(buffer) + PAGE_SIZE);
		}