From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B58213B5A6 for ; Thu, 23 May 2024 12:20:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716466825; cv=none; b=MI/1lbyIwXiMiQ+CE+2noLZCmbov3ZE7OXIBlHYfnbzoNw2n3/31zs9eQwfwXg4wg3LoRi8HHEkIPHgio/zLazxsWanP+5L6F+V91bDkvuSilcheuIRj+ye3IzzTmYU4uJypai149cYzzjoHVwTdSL7Cr5dRgdTY5aNBLBkENPs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716466825; c=relaxed/simple; bh=2YQPc28KuridRQl7F1AZQYhTyMqtcAcHkDu7TxAvmZ4=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=kgwlzbPJI9NZ0/FtVx6gfpLgLn0+g+To4yh2oW8EgrvRDeLwaJmGSlCTvbskj32I6yhkcfYLh4kBhjxgW90p+uFVt5CAQEpoxB1Vm+27nRehlmUJCZxz1SEp5zA8bLjZoHD0xJAYs6tg8VZXMYGsF2gl3LHqQ/3QEnX2JR/ZSQQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Rpvj/4oY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Rpvj/4oY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEF20C2BD10; Thu, 23 May 2024 12:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1716466825; bh=2YQPc28KuridRQl7F1AZQYhTyMqtcAcHkDu7TxAvmZ4=; h=Subject:To:Cc:From:Date:From; b=Rpvj/4oYXTXJLWFBggdlYrvU7NdfBx1iE26dkO+UflT2Nx4gokOvtyfGzBcZRXlIf 4Fq01mWi+cBE4LV8kPLM7Lgb8Pq3IrNJKCvOHsnP8p2/EYfSWPJOPcOqG2NnkNp7qJ 1GFkgedCNVXUyjiMfd8cIFAfXTVPYvEkM6KK2hHA= Subject: FAILED: patch "[PATCH] binder: fix max_thread type inconsistency" failed to apply to 5.4-stable tree To: cmllamas@google.com,aliceryhl@google.com,arve@android.com,gregkh@linuxfoundation.org Cc: From: Date: Thu, 23 May 2024 14:20:14 +0200 Message-ID: <2024052314-pardon-confider-6160@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 42316941335644a98335f209daafa4c122f28983 # git commit -s git send-email --to '' --in-reply-to '2024052314-pardon-confider-6160@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 42316941335644a98335f209daafa4c122f28983 Mon Sep 17 00:00:00 2001 From: Carlos Llamas Date: Sun, 21 Apr 2024 17:37:49 +0000 Subject: [PATCH] binder: fix max_thread type inconsistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The type defined for the BINDER_SET_MAX_THREADS ioctl was changed from size_t to __u32 in order to avoid incompatibility issues between 32 and 64-bit kernels. However, the internal types used to copy from user and store the value were never updated. Use u32 to fix the inconsistency. Fixes: a9350fc859ae ("staging: android: binder: fix BINDER_SET_MAX_THREADS declaration") Reported-by: Arve Hjønnevåg Cc: stable@vger.kernel.org Signed-off-by: Carlos Llamas Reviewed-by: Alice Ryhl Link: https://lore.kernel.org/r/20240421173750.3117808-1-cmllamas@google.com Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/android/binder.c b/drivers/android/binder.c index dd6923d37931..b21a7b246a0d 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -5367,7 +5367,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) goto err; break; case BINDER_SET_MAX_THREADS: { - int max_threads; + u32 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 7270d4d22207..5b7c80b99ae8 100644 --- a/drivers/android/binder_internal.h +++ b/drivers/android/binder_internal.h @@ -421,7 +421,7 @@ struct binder_proc { struct list_head todo; struct binder_stats stats; struct list_head delivered_death; - int max_threads; + u32 max_threads; int requested_threads; int requested_threads_started; int tmp_ref;