From bcbef3bdbd091adedd33044a4260fa8dab21fb8a Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 22 May 2026 08:19:54 +0200 Subject: [PATCH] x86/PV: split a get_unsafe() invocation Misra C:2012 rule 13.6 takes issue with the gdt_ldt_desc_ptr() call appearing (deep) inside sizeof(), as used by get_unsafe(). No functional change intended. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/pv/emulate.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/pv/emulate.c b/xen/arch/x86/pv/emulate.c index a00d1c6c82..48052f9ac3 100644 --- a/xen/arch/x86/pv/emulate.c +++ b/xen/arch/x86/pv/emulate.c @@ -29,8 +29,14 @@ int pv_emul_read_descriptor(unsigned int sel, const struct vcpu *v, */ ((sel & 4) && (sel >> 3) >= v->arch.pv.ldt_ents) ) desc.b = desc.a = 0; - else if ( get_unsafe(desc, gdt_ldt_desc_ptr(sel)) ) - return 0; + else + { + const seg_desc_t *pdesc = gdt_ldt_desc_ptr(sel); + + if ( get_unsafe(desc, pdesc) ) + return 0; + } + if ( !insn_fetch ) desc.b &= ~_SEGMENT_L;