]>
x86/emul: Fix extable registration in invoke_stub() master staging
authorAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 15 May 2025 18:01:33 +0000 (19:01 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Tue, 1 Jul 2025 11:56:59 +0000 (12:56 +0100)
commitb9f83119750ffa0e2e925d74e6e5f38925094883
tree03c615cb3fab99fb6e8d50d572604be4e1638c0e
parent64be4fecd7d95058fbbb9057a6170fb4e0e9ad06
x86/emul: Fix extable registration in invoke_stub()

For exception recovery in the stubs, the registered address for fixup is the
return address of the CALL entering the stub.

In invoke_stub(), the '.Lret%=:' label is the wrong side of the 'post'
parameter.  The 'post' parameter is non-empty in cases where the arithmetic
flags of the operation need recovering.

Split the line to separate 'pre' and 'post', making it more obvious that the
return address label was in the wrong position.

However, in the case that an exception did occur, we want to skip 'post' as
it's logically part of the operation which had already failed.  Therefore, add
a new skip label and use that for the exception recovery path.

This is XSA-470 / CVE-2025-27465

Fixes: 79903e50dba9 ("x86emul: catch exceptions occurring in stubs")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
xen/arch/x86/x86_emulate/private.h