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=1795052761; b=miFMlStXHf5OZwkzcGIOstIIpmrWB2SbdwzrPGLhUNDJ0uq8QaIj3BC7eL/GfkC/qnCz YGeB8mXactHmPYiL9bV1II/RxzliA5PW2G6OFgu/pD5VuKee2tJ3YIAQZZ9CjFNMlmsDd EWZ6qS/ptT/aUCAV126lhV84G7hTOgmzMt7Oh8VLESJg5VIpPhYf9mCWHHQsrahUMwSwn 6bcu8x9N23P5srE6UPKGQsswwXCqJTy0kDcK9o4cCp9OUcyFzhyn78VCeJ9DxqKLdpOcp MGwPURHDJL/EbIKDOuxva2T1OtD0lSZnrSq5pCvkbR2uNUuors9t51NXLC4ojFEYNxw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795052761; 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=CZiWiZBxPw88NOlapOViyWkmH3SNKodYsbxnjdPXWao=; b=zMaTEjcnHAVhkQ2SRcPjvoZIdD6vHf0K8GDrP1xiIaF1k4hbiNHECi8LRxmQgz4XHbRR YvIA+E79Ja1YrQZJ/k2nc2wfuuyJSf67+MiKIEciwXp0ito6EtiiBpohFipTNJTke45uf z4liwOmmMS6b/vGNpH8wdP5/eBWP0gVqDq92sm6NshfiLB6tEPduxGK97RxfnLjofGIvS ZIdK/hjZd+sxRWL2m89uMNwCxuL+D5K+Xp4lZeTLnJrlynxt1Aedw8nQRjS0AYm27dqWn PCtAwmlinR9a334llvRtuqFAc3C94bCe7Px3GvbZHzSkdQ7wPf7cMTCviPM7z2kE3FA== 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=B3Ga0Mzc; 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 BDF19606A31C; Thu, 19 Nov 2026 01:46:01 +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=B3Ga0Mzc Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA39B1F000C4; Thu, 19 Nov 2026 01:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795052761; bh=CZiWiZBxPw88NOlapOViyWkmH3SNKodYsbxnjdPXWao=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=B3Ga0MzcLo2F3hPNLecl9jtBF6lGbyqi2lVVyw/STIg1cCod/ap5OpCkeq4GWtiXl Ho2+DqSX8IPvuT02sH9iKaoPMk+moZD4Z1o6CSSb0vd1XIVQWvMPkc0wHuVeTGa+A8 IdEjeUK6i3XhjZzyGTOnAH/OVvu8qA/lLCzc31d0= 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 5.15 0632/2214] sh: intc: Sort the prio and sense lists after filling them Date: Wed, 18 Nov 2026 15:38:28 +0100 Message-ID: <20261118150036.633982974@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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