]> xenbits.xensource.com Git - xen.git/commitdiff
livepatch: use proper rc variable in livepatch_do_action()
authorPawel Wieczorkiewicz <wipawel@amazon.de>
Mon, 6 Jan 2020 12:56:23 +0000 (12:56 +0000)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Mon, 6 Jan 2020 17:22:51 +0000 (17:22 +0000)
Fix c&p bug in the livepatch_do_action() code of
LIVEPATCH_ACTION_REPLACE case.
The correct variable handling return code of revert action is
other->rc in this case.

Coverity-ID: 1457467
Fixes: 6047104c3c ("livepatch: Add per-function applied/reverted state tracking marker")
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Pawel Wieczorkiewicz <wipawel@amazon.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
xen/common/livepatch.c

index 2a8ab13879e1145dd99d5434cfbf61dacecc1b51..5e09dc990b749e923182c91100994ad22da3d97b 100644 (file)
@@ -1456,7 +1456,9 @@ static void livepatch_do_action(void)
             else
                 other->rc = revert_payload(other);
 
-            if ( !was_action_consistent(other, rc ? LIVEPATCH_FUNC_APPLIED : LIVEPATCH_FUNC_NOT_APPLIED) )
+            if ( !was_action_consistent(other, other->rc
+                                        ? LIVEPATCH_FUNC_APPLIED
+                                        : LIVEPATCH_FUNC_NOT_APPLIED) )
                 panic("livepatch: partially reverted payload '%s'!\n", other->name);
 
             if ( other->rc == 0 )