Received: from sender4-op-o12.zoho.com (sender4-op-o12.zoho.com [136.143.188.12]) (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 722441F0995 for ; Sat, 18 Jul 2026 09:48:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.12 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784368089; cv=pass; b=P5ZzLTazm5AmFjTGQ6d8hd+Tev6Aq1h/ZFVLl08vJ7OSzYzE4zeyiFf0UdTDzkm8gVyPpG9sx8YHeu8Dr6Ls4WsCyGy0QsMDdt9RTHk7rX1EDNcpgAMOXKPAzFdCFemVcTd8DcPFPhxY7D8Xyj7II3B1vvWf3ZysS+gccInEe6k= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784368089; c=relaxed/simple; bh=FUF/L0YQUgnbI0bPv9EPxElG5C9UkN++rcE66XWvi9U=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Z8vTtkEruqya/ReU6yyMq9kHhQ7ck897xFOZyhbHmN/Kt6O7RnFe8hMCZEwMOokJy0ONU0xSpDUNkRV1+fbENgWDv+u93WoIsdGZFWQ/w+HIQLg7n0Anq+8Fok/3E9V/aAKCW0lL03pYSt6jHzY4mGxcqM0PefkzfsDnY0aimRw= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=yoavmoshe.com; spf=pass smtp.mailfrom=yoavmoshe.com; dkim=pass (1024-bit key) header.d=yoavmoshe.com header.i=linux@yoavmoshe.com header.b=OLHZyAum; arc=pass smtp.client-ip=136.143.188.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=yoavmoshe.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yoavmoshe.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=yoavmoshe.com header.i=linux@yoavmoshe.com header.b="OLHZyAum" ARC-Seal: i=1; a=rsa-sha256; t=1784368085; cv=none; d=zohomail.com; s=zohoarc; b=Ggd1xO1AWhSuWVO3h9yTEnh4+Z9ztuPZW9o4xDV6Mnt6mSRRLBGcpTi2lxtAIJKBfGMaqYcfLh7JmnUGDT0ZTNOhkCgRsCvNkA3P6B7AT5EEl8Wz2IQUy4yMb7udJ+52sjfuU88EM5yf+Ta1Xh6dPQ1gLBeldtJTP+VJ1lztTXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784368085; h=Content-Transfer-Encoding:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=rWVwE/9DychYc9K/smhGvixkna2otDPJRQGtaKRGia8=; b=IQES/14qN7IVaB8vj1+ukTDKsCmPnAPprf4c74FpEtXS/JiNTVdTomBXgQK/4FQ7xM1fWQa86Cwke/xk+xeHyGvhkP13EK4mJSbHTANBtPfshTT5AKu4hsGmRVaTI7s8QajsTR7yeELos1Fb2EVMNZKGGyeohOHCnaI9ARn3QTA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=yoavmoshe.com; spf=pass smtp.mailfrom=linux@yoavmoshe.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1784368085; s=zoho; d=yoavmoshe.com; i=linux@yoavmoshe.com; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=rWVwE/9DychYc9K/smhGvixkna2otDPJRQGtaKRGia8=; b=OLHZyAumffPPqp0YOM14ADzIw1Gwd/GKT6omcsSElXR71yIN4KGZfsdbzSdrr6oA 1JWnDQQsmjL4oKDwcuC7VTqo8mKRZLpIqNBnF7YD+9DZLnLFA3hymDm4zg+O7Rm1Kai FKRBLP7dmwPqr0UEkgFl+F2bVhfi27nQFnGG6KWw= Received: by mx.zohomail.com with SMTPS id 1784368082328209.71953018641432; Sat, 18 Jul 2026 02:48:02 -0700 (PDT) From: Yo'av Moshe To: sashiko-reviews@lists.linux.dev Subject: [PATCH v3] ARM: imx: Fix suspend/resume crash with Clang CFI Date: Sat, 18 Jul 2026 11:47:47 +0200 Message-ID: <20260718094747.83634-1-linux@yoavmoshe.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: sashiko-reviews@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External Relocated suspend code in OCRAM lacks compiler-generated CFI type signatures. When CONFIG_CFI=y is active, the indirect call to imx6_suspend_in_ocram_fn triggers a strict CFI violation panic. To resolve this safely without reducing CFI protection scope: 1. Create a minimal wrapper function imx6_suspend_in_ocram annotated with __nocfi to handle the unverified indirect call. 2. Remove the __nocfi annotation from the main imx6q_suspend_finish function to preserve full CFI coverage for other indirect calls in that scope (such as cpu_do_idle() and flush_cache_all()). 3. Mark global variables ccm_base, suspend_ocram_base, and the imx6_suspend_in_ocram_fn pointer as __ro_after_init to prevent them from being used as target vectors for CFI bypass exploits. Cc: stable@vger.kernel.org Signed-off-by: Yo'av Moshe --- Tested on a Kobo Clara HD (i.MX6SLL SoC) running postmarketOS edge. Before this patch, suspending the device caused an immediate silent hang requiring a hard-reboot. With this patch applied, suspend and resume work successfully. Differences from v2: - Restrained __nocfi scope by adding a dedicated, minimal 1-line wrapper function (imx6_suspend_in_ocram) for the OCRAM call, avoiding disabling CFI checks for cpu_do_idle() and flush_cache_all(). - Marked global pointers ccm_base and suspend_ocram_base as __ro_after_init to fully neutralize Write-What-Where exploit bypasses. arch/arm/mach-imx/pm-imx6.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c index a671ca498..3d5b960c5 100644 --- a/arch/arm/mach-imx/pm-imx6.c +++ b/arch/arm/mach-imx/pm-imx6.c @@ -61,9 +61,9 @@ #define MX6Q_SUSPEND_OCRAM_SIZE 0x1000 #define MX6_MAX_MMDC_IO_NUM 33 -static void __iomem *ccm_base; -static void __iomem *suspend_ocram_base; -static void (*imx6_suspend_in_ocram_fn)(void __iomem *ocram_vbase); +static void __iomem *ccm_base __ro_after_init; +static void __iomem *suspend_ocram_base __ro_after_init; +static void (*imx6_suspend_in_ocram_fn)(void __iomem *ocram_vbase) __ro_after_init; /* * suspend ocram space layout: @@ -360,6 +360,11 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) return 0; } +static void __nocfi imx6_suspend_in_ocram(void __iomem *ocram_vbase) +{ + imx6_suspend_in_ocram_fn(ocram_vbase); +} + static int imx6q_suspend_finish(unsigned long val) { if (!imx6_suspend_in_ocram_fn) { @@ -374,7 +379,7 @@ static int imx6q_suspend_finish(unsigned long val) if (!((struct imx6_cpu_pm_info *) suspend_ocram_base)->l2_base.vbase) flush_cache_all(); - imx6_suspend_in_ocram_fn(suspend_ocram_base); + imx6_suspend_in_ocram(suspend_ocram_base); } return 0; -- 2.55.0