From nobody Sun Feb 8 07:01:39 2026 Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F095C42AA6 for ; Sat, 13 Dec 2025 02:53:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765594396; cv=none; b=ceZjy0/5LwDxG+4txfChp6jJ1Hc3U7CmCbmPzVSnhGkeuqqCFLadK3BfMe21eMnm25/Otodl7ZzGJ13TV/OSoGIb3yyMiiB1oSkuzqxa/4DyAn1g/vAX5FcOJKuPgaziUnNzX19tu0YgHpNCv7V7ZgGV8rxJazMN45Bc7RZtzBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765594396; c=relaxed/simple; bh=yvrCWaA+bdU4F+fB5ieIARKVqxZvLhtfojbEfYwxMqw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D/Xo8x/GygQzVr5Yep84ZQT5G58sVzXHQD+2f2zeARizFPZT6OYIwT8kNT/ezhRps6Yy0Nfq5HbBqmM1i/apjsKqeFKvwaIKnsVrMQYrfuTNM81O3oyCVW0+RcvqabVxz4g4Qh+lNXHVcDp9DSI2aBC6xYYfP+jFdpo/ISXNg4M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B1NE67c3; arc=none smtp.client-ip=209.85.161.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B1NE67c3" Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-657c68a08a7so1062150eaf.1 for ; Fri, 12 Dec 2025 18:53:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765594394; x=1766199194; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LVTArHxUK4aenrsYSRQf+yaoCN3rgWHDwLZ5cWfqKso=; b=B1NE67c3YhsXutoZodFMklbtNEGQa6R5w79sNPqEiOg5AAadqz8sBx67bTVkBXU+cT m1yRM8PotsdU7322vNEUmEeYA+a54rUf2ZEgKj9ihwTpbqu4QUyaXKEMXAF/S5Nx9r95 E6q0hVq995kIUeRqHVhQEgzcCnQ5TI3Or7wouXBnI4cEMN1AGVOzlSUqjCp9IjOAIvri gGS7oXUjuxmltgTiK9R7lCmS9Pvq/Sgt+9Nxx/O4eJtyahz2uRS+d4l9aIijvHj8mCUE h3rAK0sOsjGRXjt9F3MZez6XT2sMtIYn0kX+MQ2JHTSWSUm0CMVuoQfFwUJb9KoR/4Tl ItPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765594394; x=1766199194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LVTArHxUK4aenrsYSRQf+yaoCN3rgWHDwLZ5cWfqKso=; b=JzKtFkSrqM/WDaqDYjydbe3mPa3pAmN9byNBcKO8HKUcj1DOEjN9njSAIzPz9VY8g8 o9pEuL4vSdgLzBP7lIYvqJwJaMNE/zjWcgfEb2V4tqP92bEMZqQDw7JNJ3UEQN7UAPGy r8/JcG9W0gci1Ga//+lbBiZrxWB/3m67aE/FWD/7PeTRj+buR93jvMg00OSu6S9ffLzo wY3k4ugNTrri5uUU/ne54H45qExSlaDGJYiCP0EsNpYknq3BnPFvfV12aD1oJ6EvlSiU gerFFpqrpu+oQA0H7cTk8Gj9AVDiYpNuMdFktJpafdcvaBu5SsIoUy6N8KHIy3ut5YGr X0Fg== X-Gm-Message-State: AOJu0Yyskc7GUXTMwie3d7gFin6Gy7Ih+sOAGwh5Ihw4qdsyrHhzXskN NQWZMou8QNrOc0Vzvoi/+8x3aGXCUybNdvO7xItoKTUFu/KIBzBOX6K45DVk1JI= X-Gm-Gg: AY/fxX4VJaCc6EfTAn/zR0nXgNlYcCaKYV9Z3WIIcxS1i5kibJnvXVsvbZ+Cn/3TCSl E8hmNSpRQDsLsP9GlNHbROaknOXiIRPNvnWU5cDDATbmTCb4Hjcmdv5eYWUBfv5/l71AW4PggdC y3ElxQf0Cv98JEmWs1RRWuR7Zx6T/Mq0s+Gmi18U3hy8xvFz87QR8oH6jzCgaI8AcyZVGFaYoft lpk6uS5MGdn53vmfIFDvS42qD3i3D7KnYNSQLjczMdg8pfwHbOsoylhIcxTJ7bF5ZJIFGs3vHz0 YeZR9ngP2LiGXsO6VWbpZupyhiV25lS9/Syg50AsHJGKpbNCEbRApOc+Cz/h6EN6m0RwmnFjsA4 MyKNbecQgFrAbpLLbsyu5UUeMvYhirE6w8BXmOTh6GoyBDIG0U2xTPXAexyOTOb1wrJUapUWZcG IFLKKqdPiMcWvj/kO7vgSPIWNLLV2y67K3QaQYF9QWfSKfJ0VyPyjjk87HmH6+gpscuAM92pWV4 uFWccd3/DsvsGlYAM3dJmV0UT4n0QvcZXV0lQ== X-Google-Smtp-Source: AGHT+IHpsQgV7k3FMPRPF1YBP2tgdkrWgqn9MFPTFFPOoCw++IHTP8pl6GOzAM3P4VQ2xo2es8ZzXg== X-Received: by 2002:a05:6820:2905:b0:659:9a49:8f74 with SMTP id 006d021491bc7-65b45736683mr2147971eaf.57.1765594393870; Fri, 12 Dec 2025 18:53:13 -0800 (PST) Received: from poisoncrownitro.ht.home (72-48-10-44.dyn.grandenetworks.net. [72.48.10.44]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-65b35f4f923sm3899435eaf.7.2025.12.12.18.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Dec 2025 18:53:12 -0800 (PST) From: Ricky Ringler To: Chris Zankel , Max Filippov Cc: linux-kernel@vger.kernel.org, Ricky Ringler Subject: [PATCH] xtensa: mmu: validate user access in fast_load_store with MMU Date: Fri, 12 Dec 2025 20:52:52 -0600 Message-ID: <20251213025252.2574336-2-richard.rringler@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251213025252.2574336-1-richard.rringler@gmail.com> References: <20251213025252.2574336-1-richard.rringler@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" fast_load_store aligns faulting address then reads two words with l32i. With CONFIG_MMU, bad user access can fault in this path. Replace arbitrary jump to .Linvalid_instruction with access_ok() to validate aligned address before loads and branch to .Linvalid_instruction on failure. a0: scratch. a2: sp. Matches existing usage in Xtensa entry.S. Tested-by: Ricky Ringler Testing: - Built Xtensa with CONFIG_MMU enabled - objdump before/after comparison and validated code path - Ran emulated Xtensa device with QEMU and manually triggered unaligned and aligned loads Signed-off-by: Ricky Ringler --- arch/xtensa/kernel/align.S | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S index ee97edce2300..5205c6ebb586 100644 --- a/arch/xtensa/kernel/align.S +++ b/arch/xtensa/kernel/align.S @@ -21,6 +21,9 @@ #include #include #include +#ifdef CONFIG_MMU +#include +#endif =20 #if XCHAL_UNALIGNED_LOAD_EXCEPTION || defined CONFIG_XTENSA_LOAD_STORE #define LOAD_EXCEPTION_HANDLER @@ -178,16 +181,17 @@ ENTRY(fast_load_store) bbsi.l a4, OP1_SI_BIT + INSN_OP1, .Linvalid_instruction =20 1: - movi a3, ~3 + movi a3, ~3 and a3, a3, a8 # align memory address =20 __ssa8 a8 =20 #ifdef CONFIG_MMU /* l32e can't be used here even when it's available. */ - /* TODO access_ok(a3) could be used here */ - j .Linvalid_instruction + movi a5, 8 + access_ok a3, a5, a0, a2, .Linvalid_instruction #endif + l32i a5, a3, 0 l32i a6, a3, 4 __src_b a3, a5, a6 # a3 has the data word --=20 2.43.0