]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/sev: Fix operator precedence in GHCB_MSR_VMPL_REQ_LEVEL macro
authorSeongman Lee <augustus92@kaist.ac.kr>
Sun, 11 May 2025 09:23:28 +0000 (18:23 +0900)
committerBorislav Petkov (AMD) <bp@alien8.de>
Sun, 11 May 2025 09:38:03 +0000 (11:38 +0200)
The GHCB_MSR_VMPL_REQ_LEVEL macro lacked parentheses around the bitmask
expression, causing the shift operation to bind too early. As a result,
when requesting VMPL1 (e.g., GHCB_MSR_VMPL_REQ_LEVEL(1)), incorrect
values such as 0x000000016 were generated instead of the intended
0x100000016 (the requested VMPL level is specified in GHCBData[39:32]).

Fix the precedence issue by grouping the masked value before applying
the shift.

  [ bp: Massage commit message. ]

Fixes: 34ff65901735 ("x86/sev: Use kernel provided SVSM Calling Areas")
Signed-off-by: Seongman Lee <augustus92@kaist.ac.kr>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250511092329.12680-1-cloudlee1719@gmail.com
arch/x86/include/asm/sev-common.h

index acb85b9346d84b9d68f9e1faac477c4dff547231..0020d77a0800011847c8dca7f554a334b066c71d 100644 (file)
@@ -116,7 +116,7 @@ enum psc_op {
 #define GHCB_MSR_VMPL_REQ              0x016
 #define GHCB_MSR_VMPL_REQ_LEVEL(v)                     \
        /* GHCBData[39:32] */                           \
-       (((u64)(v) & GENMASK_ULL(7, 0) << 32) |         \
+       ((((u64)(v) & GENMASK_ULL(7, 0)) << 32) |       \
        /* GHCBDdata[11:0] */                           \
        GHCB_MSR_VMPL_REQ)