From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795045511; b=q3px8NDnBxrNZH6srKMi10az1Fjn5Z/LWDObeZvAODEhfGh9nf8PrijBRgc8t9alltWq bG+1kGv8XhNvxF21SNF/dEJuvq/XcecuujKqpLPanS3PdpYYGXjqqRtA+gKz6Ev82iRD4 MYaumCnktlU7jlrhlVBAAyIYzKZIG75Va/ENEHX15Hh6VxTXbCDD1dEpY5ZD6h92Nap7A mqWIUoWRlxW7gix3cFvP6q6ZVKaFdVq8Js3uygW4R7Vqx05U5wWBCjBhxRLRi46mDPTHV +oL2SUaCZoi1VUwOBp4TSD2bGDdKgQUO5OtEwR4GT3VfKtvwLdlBYFYjrmzicBnxXdg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795045511; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=MhbCi6QkF7Z3QmR7NUixqikNzQ3Sfh67xEMxEDCNIPg=; b=gtse0E8WAPtYyMvTU0lGyUZwu36H9HUQj2hGitJyl5sI3LkgtjtsAGcXGXy8jZPKl8gZ WLQQz79nqLu5+DRv9zzJav4ZINyZvmZnuXhmsnPp23EBfN0/rDglZoBB4ucES+V5HEsk8 07UpkuCny7znDDy56xxPg3EK76NcDd9cOCuFqRtUpYgMkamz9hyjw8tgvuAzCatXoqilv ipbsfPe4XVTB99cNPCS6fc32zNEtqgjcCBPJUb47BJafMq+ogw/+UT7GH3iUKRmzZ41U0 nG7x8S1LjzOQtXPN68basNDyb/wUqI6jywcMvJkhSEEBHc1SO1aP7Wizfd9h1NReJTw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=IsUFQqQ5; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46EF7606A31C; Wed, 18 Nov 2026 23:45:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=IsUFQqQ5 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97F321F000C4; Wed, 18 Nov 2026 23:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795045511; bh=MhbCi6QkF7Z3QmR7NUixqikNzQ3Sfh67xEMxEDCNIPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IsUFQqQ58/mNQr3y+9K2ZvrQYRS9ZAhDAZ17d3I7jmMRaGfUWTFXXFkqUBOJrhn1B viMxYBiLTPSTfRnN0OJggyvo4TMgbavd4xZzfrQTvf/Swv6U5Up1nD9J1qOk1YXIsk tvCWPgwaKS816haQc5f9GHNhdF4fBIdQn/Ytw5gQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Karl Mehltretter , John Paul Adrian Glaubitz , Geert Uytterhoeven , Sasha Levin Subject: [PATCH 6.1 0942/2857] sh: intc: Sort the prio and sense lists after filling them Date: Wed, 18 Nov 2026 15:32:56 +0100 Message-ID: <20261118150235.522853054@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Karl Mehltretter [ Upstream commit 94a219eda3b5fb1d1753a5ecf28b171c8f308a27 ] register_intc_controller() sorts d->prio and d->sense right after allocating them, with hw->nr_prio_regs and hw->nr_sense_regs as the element count. The lists hold hw->nr_vectors entries and are only filled later, by intc_register_irq(). On SH7785, sh7785-irq0123 and sh7785-irq4567 have four vectors but the SoC's eleven priority registers, so sort() swaps 88 bytes in a 32 byte kmalloc object at boot. slub_debug=FZPU reports "Right Redzone overwritten" in kmalloc-32, and v6.5 and v6.6 panic in __kmem_cache_alloc_node() while registering sh7785-irq0123. Found with a custom QEMU model of the SH7785LCR. On it, v6.4 sh7785lcr_defconfig boots with SLAB, the defconfig default before v6.5, and hangs before the console is up when built with SLUB. Sort the lists once all vectors are registered, with the number of entries that were added. Fixes: b59f9f9775e6 ("sh: intc: optimize intc IRQ lookup") Signed-off-by: Karl Mehltretter Assisted-by: LLM Cc: stable@vger.kernel.org Tested-by: John Paul Adrian Glaubitz Reviewed-by: John Paul Adrian Glaubitz Reviewed-by: Geert Uytterhoeven Signed-off-by: John Paul Adrian Glaubitz Signed-off-by: Sasha Levin --- drivers/sh/intc/core.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index b19388b349be3..590a532e75a7e 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c @@ -277,9 +277,6 @@ int __init register_intc_controller(struct intc_desc *desc) k += save_reg(d, k, hw->prio_regs[i].set_reg, smp); k += save_reg(d, k, hw->prio_regs[i].clr_reg, smp); } - - sort(d->prio, hw->nr_prio_regs, sizeof(*d->prio), - intc_handle_int_cmp, NULL); } if (hw->sense_regs) { @@ -290,9 +287,6 @@ int __init register_intc_controller(struct intc_desc *desc) for (i = 0; i < hw->nr_sense_regs; i++) k += save_reg(d, k, hw->sense_regs[i].reg, 0); - - sort(d->sense, hw->nr_sense_regs, sizeof(*d->sense), - intc_handle_int_cmp, NULL); } if (hw->subgroups) @@ -360,6 +354,11 @@ int __init register_intc_controller(struct intc_desc *desc) } } + sort(d->prio, d->nr_prio, sizeof(*d->prio), + intc_handle_int_cmp, NULL); + sort(d->sense, d->nr_sense, sizeof(*d->sense), + intc_handle_int_cmp, NULL); + intc_subgroup_init(desc, d); /* enable bits matching force_enable after registering irqs */ -- 2.53.0