From: Andrei Vagin <avagin@google.com>
To: Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Borislav Petkov <bp@alien8.de>,
"Chang S. Bae" <chang.seok.bae@intel.com>
Cc: linux-kernel@vger.kernel.org, criu@lists.linux.dev,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, Andrei Vagin <avagin@google.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 05/10] x86/fpu: Fix potential underflow in xstate_calculate_size()
Date: Mon, 15 Jun 2026 19:37:11 +0000 [thread overview]
Message-ID: <20260615193716.1843340-6-avagin@google.com> (raw)
In-Reply-To: <20260615193716.1843340-1-avagin@google.com>
xstate_calculate_size() calculates the size required for a given set of
xfeatures. It determines the topmost feature by finding the most
significant bit in xfeatures using fls64(xfeatures) - 1.
If xfeatures is 0, fls64(0) returns 0, and topmost becomes -1.
Previously, topmost was unsigned int, so -1 underflowed to UINT_MAX.
This caused the subsequent check `topmost <= XFEATURE_SSE` to fail, and
the code proceeded to access xstate arrays using topmost (UINT_MAX) as
an index, leading to an out-of-bounds access.
Fix this by checking if xfeatures only contains legacy features (FP/SSE)
or is empty (xfeatures <= XFEATURE_MASK_FPSSE) before calculating
topmost.
Fixes: d6d6d50f1e80 ("x86/fpu/xstate: Consolidate size calculations")
Signed-off-by: Andrei Vagin <avagin@google.com>
---
arch/x86/kernel/fpu/xstate.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index a7b6524a9dea..ed39d7051d0d 100644
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -589,12 +589,13 @@ static bool __init check_xstate_against_struct(int nr)
static unsigned int xstate_calculate_size(u64 xfeatures, bool compacted)
{
- unsigned int topmost = fls64(xfeatures) - 1;
- unsigned int offset, i;
+ unsigned int topmost, offset, i;
- if (topmost <= XFEATURE_SSE)
+ if (xfeatures <= XFEATURE_MASK_FPSSE)
return sizeof(struct xregs_state);
+ topmost = fls64(xfeatures) - 1;
+
if (compacted) {
offset = xfeature_get_offset(xfeatures, topmost);
} else {
--
2.54.0.1189.g8c84645362-goog
next prev parent reply other threads:[~2026-06-15 19:37 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-15 19:37 [PATCH v3 0/10] x86/fpu: Restore and reinforce signal frame portability Andrei Vagin
2026-06-15 19:37 ` [PATCH 01/10] x86/fpu: Document " Andrei Vagin
2026-06-26 13:51 ` Alexander Mikhalitsyn
2026-06-30 19:23 ` Chang S. Bae
2026-06-15 19:37 ` [PATCH 02/10] x86/fpu: Clean up and rename variables in signal frame handling Andrei Vagin
2026-06-26 17:05 ` Alexander Mikhalitsyn
2026-06-15 19:37 ` [PATCH 03/10] x86/fpu: Split __fpu_restore_sig to extract compat path Andrei Vagin
2026-06-26 17:20 ` Alexander Mikhalitsyn
2026-06-15 19:37 ` [PATCH 04/10] x86/fpu: Document reasoning of FX-only fallback Andrei Vagin
2026-06-26 14:22 ` Alexander Mikhalitsyn
2026-06-30 19:23 ` Chang S. Bae
2026-07-31 15:34 ` Andrei Vagin
2026-06-15 19:37 ` Andrei Vagin [this message]
2026-06-26 14:32 ` [PATCH 05/10] x86/fpu: Fix potential underflow in xstate_calculate_size() Alexander Mikhalitsyn
2026-06-30 19:23 ` Chang S. Bae
2026-06-15 19:37 ` [PATCH 06/10] selftests/x86: Add a test for signal frame FPU portability Andrei Vagin
2026-06-26 14:39 ` Alexander Mikhalitsyn
2026-06-15 19:37 ` [PATCH 07/10] x86/fpu: Pre-fault only required size of xstate buffer Andrei Vagin
2026-06-26 17:28 ` Alexander Mikhalitsyn
2026-06-15 19:37 ` [PATCH 08/10] selftests/x86: Add a sigframe insufficient xstate_size test Andrei Vagin
2026-06-26 15:02 ` Alexander Mikhalitsyn
2026-06-15 19:37 ` [PATCH 09/10] x86/fpu: Allow restoring signal frames with larger xstate_size Andrei Vagin
2026-06-26 17:32 ` Alexander Mikhalitsyn
2026-06-30 19:23 ` Chang S. Bae
2026-07-01 0:48 ` Andrei Vagin
2026-07-06 17:08 ` Chang S. Bae
2026-07-07 20:27 ` Andrei Vagin
2026-07-09 21:14 ` Chang S. Bae
2026-07-10 22:24 ` Chang S. Bae
2026-07-22 0:35 ` Andrei Vagin
2026-07-30 21:26 ` Andrei Vagin
2026-08-01 0:49 ` Chang S. Bae
2026-08-04 20:30 ` Andrei Vagin
2026-08-07 15:56 ` Chang S. Bae
2026-08-07 23:12 ` Andrei Vagin
2026-08-08 3:05 ` Chang S. Bae
2026-08-08 18:50 ` Andrei Vagin
2026-08-11 6:06 ` Chang S. Bae
2026-08-14 21:00 ` Andrei Vagin
2026-08-17 14:23 ` Chang S. Bae
2026-08-17 16:36 ` Andrei Vagin
2026-06-15 19:37 ` [PATCH 10/10] selftests/x86: Check restoring FPU state " Andrei Vagin
2026-06-26 15:12 ` Alexander Mikhalitsyn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260615193716.1843340-6-avagin@google.com \
--to=avagin@google.com \
--cc=bp@alien8.de \
--cc=chang.seok.bae@intel.com \
--cc=criu@lists.linux.dev \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®