From c1eefaf65b26d101d4edd9cfa47c3adc527755db Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jul 2024 17:06:31 +0000 Subject: [PATCH] Revert "binder: fix max_thread type inconsistency" This reverts commit e78531e8cacec34f94eb65d1f466eb1e25408cb7 which is commit 42316941335644a98335f209daafa4c122f28983 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Cc: Carlos Llamas Change-Id: Ice729771f03c033b7ffb9a0042c81089e8bb9b10 Signed-off-by: Greg Kroah-Hartman --- drivers/android/binder.c | 2 +- drivers/android/binder_internal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 1f5f6f1e3049..b620c590bed6 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -5630,7 +5630,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) goto err; break; case BINDER_SET_MAX_THREADS: { - u32 max_threads; + int max_threads; if (copy_from_user(&max_threads, ubuf, sizeof(max_threads))) { diff --git a/drivers/android/binder_internal.h b/drivers/android/binder_internal.h index 63ed97dce8a5..4164c346b301 100644 --- a/drivers/android/binder_internal.h +++ b/drivers/android/binder_internal.h @@ -447,7 +447,7 @@ struct binder_proc { struct list_head todo; struct binder_stats stats; struct list_head delivered_death; - u32 max_threads; + int max_threads; int requested_threads; int requested_threads_started; int tmp_ref;