Skip to contentSkip to conversation

x86/domctl: Fix unitialized copyback in XEN_DOMCTL_PSR_GET_*

PATCH In review Johann Höpfner 2 participants 2 messages Aug 9 – Aug 12

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/domctl: Fix unitialized copyback in XEN_DOMCTL_PSR_GET_*

domctl_psr_get_val() copies unitialized stack space back if psr_get_val fails. Fix by zero-initializing v_.

Fixes 03f30dc193c8 ("x86: refactor psr: L3 CAT: implement get value flow.")

---

Consider instead removing the local variable indirection introduced by 03f30dc193c8 and passing &(domctl)->u.psr_alloc.data to psr_get_val instead or only conditionally setting copyback true.

 xen/arch/x86/domctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
xen/arch/x86/domctl.c +1 -1
index f26990208d..6e42fa383c 100644
@@ -1347,7 +1347,7 @@ long arch_do_domctl(
             break;
 
 #define domctl_psr_get_val(d, domctl, type, copyback) ({    \
-    uint32_t v_;                                            \
+    uint32_t v_ = 0;                                        \
     int r_ = psr_get_val((d), (domctl)->u.psr_alloc.target, \
                          &v_, (type));                      \
                                                             \
Signature · 1 line
2.53.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Johann Höpfner

domctl_psr_get_val() copies unitialized stack space back if psr_get_val fails. Fix by zero-initializing v_.

Fixes 03f30dc193c8 ("x86: refactor psr: L3 CAT: implement get value flow.")
Quoted 3 lines

Consider instead removing the local variable indirection introduced by 03f30dc193c8 and passing &(domctl)->u.psr_alloc.data to psr_get_val instead or only conditionally setting copyback true.

Well - the way you've done it is clearly easiest / most obviously correct.

Jan