From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from zg8tmtyylji0my4xnjqumte4.icoremail.net (zg8tmtyylji0my4xnjqumte4.icoremail.net [162.243.164.118]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 28C4C274B4A for ; Mon, 21 Sep 2026 02:21:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=162.243.164.118 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789957283; cv=none; b=CkorsIe4bau/em1I/bNwUoDUllChpaRPfBX8fWGWZVnooRd4hLBfoRbTvGtegJOxhs0gA1gQmkesXzCESey4t1AKfJXoj/dOu69j8WmQqQAhPw/hUN+A7f/bY9Si8849dEBcUdtDFcnVGkJlCf0AUvADrBghiDHELMrIRUFV6ao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789957283; c=relaxed/simple; bh=HCMEsHhQSh9fL1aSSrEZ6N8krgvgK3sjADxC7MoFp+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aNnuz0KXN+Cl6w6bmFqFdX14L6s2/ekmeqSIU4L99/gM1L6t452SfqT0I15ACEmKjU11jQOFI63noV41vZELNxyiujZPLSxddklq33GOatuDFG7glauIAV7RAz6hg9nfcnr5ARj4X5Bs5jdXNXTtOwLnTe3S5Ih7NiEO6iIx+o8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=phytium.com.cn; spf=pass smtp.mailfrom=phytium.com.cn; arc=none smtp.client-ip=162.243.164.118 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=phytium.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=phytium.com.cn Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-7 (Coremail) with UTF8SMTP id AQAAfwDn7cGclLBq9TqfAA--.1908S2; Mon, 21 Sep 2026 10:21:16 +0800 (CST) Received: from WIN-B62RPRBL2BM.localdomain (unknown [218.76.62.144]) by mail (Coremail) with SMTP id AQAAf8DwBXSYlLBqHvDYAA--.41704S3; Mon, 21 Sep 2026 10:21:12 +0800 (CST) From: Zhu Ling To: maz@kernel.org, tglx@kernel.org Cc: radu@rendec.net, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Zhu Ling Subject: [PATCH v2] irqchip/gic: Fix UBSAN shift-out-of-bounds in GIC helpers Date: Mon, 21 Sep 2026 10:21:00 +0800 Message-ID: <20260921022101.20941-1-zhuling2709@phytium.com.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: <86ldjlp0qi.wl-maz@kernel.org> References: <86ldjlp0qi.wl-maz@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:AQAAf8DwBXSYlLBqHvDYAA--.41704S3 X-CM-SenderInfo: x2kxzxlqjsliuz6sx5pwlxzhxfrphubq/1tbiAQAFAWqwNEoBEwAAsz Authentication-Results: hzbj-icmmx-7; spf=neutral smtp.mail=zhuling270 9@phytium.com.cn; X-Coremail-Antispam: 1Uk129KBjvJXoW7AF48Zr4kJrWUAF4DuF4kZwb_yoW5JryUpF W5J34Iyr4Iy3Wa9a1DAF1UZry5Jwn3KrW2krW7Gasrury5Gas8Aa1ay3sxX3W7XrZrAa4U C3ZaqF18u3WUAFDanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU When running with UBSAN enabled, enabling a GPIO controller that uses a GIC interrupt as its parent triggers several shift-out-of-bounds warnings: shift-out-of-bounds in drivers/irqchip/irq-gic-common.c:50:21 left shift of 2 by 30 places cannot be represented in type 'int' Similar reports are emitted from gic_poke_irq() and gic_peek_irq() in drivers/irqchip/irq-gic-v3.c. These masks are generated by shifting signed integer constants, which invokes undefined behavior when bit 31 is selected. Use BIT() to generate the masks with an unsigned type and make their intent explicit. Signed-off-by: Zhu Ling --- Changes in v2: - Use BIT() instead of explicit unsigned shifts, as suggested by Marc. - Drop the redundant introductory text from the email. - Update the author email address. Link: https://lore.kernel.org/r/2fJDwUUYdEf2_eaRa041L9xkT8RkSWFeo7euOnqMbbPhUatLlEaAvGfB6sOspDmXaxO87Eh7bQLV9UolyjbMtZBT1wB2UGypjPOo0Z-RC0Q=@proton.me --- drivers/irqchip/irq-gic-common.c | 2 +- drivers/irqchip/irq-gic-v3.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c index c776f9142610..8bd1eaa54295 100644 --- a/drivers/irqchip/irq-gic-common.c +++ b/drivers/irqchip/irq-gic-common.c @@ -48,7 +48,7 @@ void gic_enable_quirks(u32 iidr, const struct gic_quirk *quirks, int gic_configure_irq(unsigned int irq, unsigned int type, void __iomem *base) { - u32 confmask = 0x2 << ((irq % 16) * 2); + u32 confmask = BIT(((irq % 16) * 2) + 1); u32 confoff = (irq / 16) * 4; u32 val, oldval; int ret = 0; diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 6e1fa5b247fc..15110d47ddb0 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -457,7 +457,7 @@ static int gic_peek_irq(struct irq_data *d, u32 offset) u32 index, mask; offset = convert_offset_index(d, offset, &index); - mask = 1 << (index % 32); + mask = BIT(index % 32); if (gic_irq_in_rdist(d)) base = gic_data_rdist_sgi_base(); @@ -473,7 +473,7 @@ static void gic_poke_irq(struct irq_data *d, u32 offset) u32 index, mask; offset = convert_offset_index(d, offset, &index); - mask = 1 << (index % 32); + mask = BIT(index % 32); if (gic_irq_in_rdist(d)) base = gic_data_rdist_sgi_base(); -- 2.43.0