From nobody Tue Dec 16 07:41:39 2025 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) (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 8B7F52820C6 for ; Sun, 14 Dec 2025 22:30:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765751423; cv=none; b=Z5eI7Rg8nXTcaDnqeRTMB5C0ISG5CxNDTmgvk2o6lxzJiw2tGvaG/x9RMO/eF+V7f3bJpjwRyuENjUfdXfrwQyYg+3kdw+JtEUxeEUo7ALTIK4wWaXsCK4aJ4BvCpOYCp+e1poGOwwdyp/wjT5AHm17Z9vLGmuAa/ZnjIqXmhYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765751423; c=relaxed/simple; bh=Dhz8W266bPkXwO2CeYIJ80SGC/KYvhXwjAOEQw73Rts=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gW8w6Sp1oKLac3c7aBNd63H3ZDgyTKzAEr4pF/tuKzB12KrHd1/0QGOmXdQgggTq20BOqzF7u7hZ2PnfY/A1XOtBv4OO6c8yBjelP0qtYEe+tLyNLE689lxMppZNN1HFb88Fm7W6W02oIMlDC+naJjl8jy5piRFUU40E1J2oSas= 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=FEvU7NBq; arc=none smtp.client-ip=209.85.210.44 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="FEvU7NBq" Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-7c6d1ebb0c4so2380416a34.1 for ; Sun, 14 Dec 2025 14:30:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765751420; x=1766356220; 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=VhYuptul7esmIkhoSlR/77pQVJ/JkHJV11NBCTAN4bc=; b=FEvU7NBqhWYxtzSFyAcPspOFoTZIyEIMSMqYght2Bi1Tutk132Gl2uYHR8fPD4JkaK 9cs4EWWOWYro/HsGXNYP3ZQO7LE1c4OHf5tOqRiDrrX2BrDnp/S2gAJ5Ex8K+uzTSTc9 sYEZM4td5Hfz4jIYd997v94jPPYaaB7xj3wm0pxJIMarO6CCdnGy628uQ+zhbzmW2FN8 qv5WLLoDx9uvJ94vvSFGNRgOg8doY2RtvRXTQ3ENQrrhkRsMb6KlSWGem29wmnW1WTvQ rCRIzPVc/oma8gtK+ssou7iy8z+g68aFobR/WPM8bMpjqBafYGJZeFCTjdIPri1oTPQW iomQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765751420; x=1766356220; 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=VhYuptul7esmIkhoSlR/77pQVJ/JkHJV11NBCTAN4bc=; b=qaPDW2ZpBb2VIN3UZpbE5qLTmT+7nsQX+f45rbCzrS9QmcymfgmsVzKKyRYU0nj2LG LcvKBf2XpyhoKF16M0YvDx3791wjyQP6l8BsnU4iyn1mUsUOEgX0M4A2/S+ChogIIiQj 602zQ2F0zes5dLF3bULCYJvKg7vpS2RvGhDIkr8xAHHYAZndPLFKNI+xlKZ1M9fbIRhp eNnWDf2+OKRtx0V78JuhjgbiuM7AojDv7KcUqWN4bt9K8fZ5js84gl6JBNY79S2toiNW rAwImj0RDxJvKuj8O5UqqXXit+fMEekbKPmA3r+jFYSKaD1HI3PeGJCqAPj4WLgs0Bx5 ddEw== X-Gm-Message-State: AOJu0Ywl8cRsdMOeJ+Xq1wjIw0P6E+qdpG+KYdl0Y+1HKPCqdWj5w9G0 dI7EbWvK4jpWj33oLCcfALDj/H5fAZlKTRJD/uUjyXPUyheWHi0rg7o= X-Gm-Gg: AY/fxX7kdq7SV0zVzVQ/VH1LpmmKozKZpgeJNEswG5qtkmfLOrKycoJCZxPyompvhaP gsFdz3l+Uw2dodsiP5tuQOtpYu2nu83TrWPJfXW65kQUgh0bWpjqWi3F2Q2iKpBQNRbNyuQnUY0 B3cWRyfaE06CArCOJ5QEyKuShPLfTn++6vtHSniUUOLcZ3BrN13vJVPvJreSdD0tmt7A3aHR56y W6qEJseOK9MZAlqgOdWfG2YY1d3kG9ekBtOg+QerYFj4/6mwOoGdOhwJVPoj92TyCwRCP6oYNPh Mr/cDgTs2H1tpaXenW/qiwu2t1OpzU4Um2xOXj/C6O3gIdMLZWarbWZvnk7gqcm9dFutZ6GcdDt S1HnKtl92Hx74FVAyIs4GKC6ah4+bs4o5d104hiOKG+Pa2XRNtqNevNfemATel8qdrXInkZKJiz 9INN/lFDMw1VgqkKmdsF32PtyIr3YCZ7VRne/+3b+326hI4qcS4MFAzAS/aXxr2n7wWvD448jCN S4B+rfrbdKGYetitYjAlhnI+7WM8cz94+30iQ== X-Google-Smtp-Source: AGHT+IEFBXvJU1gG5kNKFDjPOvQY/TkvgUMPGDqKEVxRaF0pNPMtgFoGTXV09WuQK69c74x3KJVa7Q== X-Received: by 2002:a05:6830:314d:b0:7c7:6977:17cb with SMTP id 46e09a7af769-7cae83628f6mr5891434a34.21.1765751420115; Sun, 14 Dec 2025 14:30:20 -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 46e09a7af769-7cadb321230sm8182574a34.20.2025.12.14.14.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Dec 2025 14:30:19 -0800 (PST) From: Ricky Ringler To: Max Filippov , Chris Zankel Cc: linux-kernel@vger.kernel.org, Ricky Ringler Subject: [PATCH v2] xtensa: align: validate access in fast_load_store Date: Sun, 14 Dec 2025 16:28:57 -0600 Message-ID: <20251214222856.2714887-2-richard.rringler@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251213025252.2574336-2-richard.rringler@gmail.com> References: <20251213025252.2574336-2-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" access_ok() is used only in user mode and branches to .Linvalid_instruction on fault. Kernel mode behavior unchanged. v2: - Address Max's feedback - Fixed formatting - Added user mode branch Tested-by: Ricky Ringler Testing: - Built with CONFIG_MMU enabled - objdump before/after comparison and validated code path Signed-off-by: Ricky Ringler --- arch/xtensa/kernel/align.S | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S index ee97edce2300..64e775933e9b 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 @@ -185,8 +188,12 @@ ENTRY(fast_load_store) =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 + rsr a6, ps + bbsi.l a6, PS_UM_BIT, 1f # user mode + j .Linvalid_instruction # kernel mode +1: + movi a5, 8 + access_ok a3, a5, a6, a2, .Linvalid_instruction #endif l32i a5, a3, 0 l32i a6, a3, 4 --=20 2.43.0