[Xen-changelog] [xen master] livepatch: use proper rc variable in livepatch_do_action()

[patchbot@xxxxxxx]

commit 0dd92688080202adcc43dcb3486d4143110a66d5
Author:     Pawel Wieczorkiewicz <wipawel@xxxxxxxxx>
AuthorDate: Mon Jan 6 12:56:23 2020 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Jan 6 17:22:51 2020 +0000

    livepatch: use proper rc variable in livepatch_do_action()
    
    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@xxxxxxxxxx>
    Signed-off-by: Pawel Wieczorkiewicz <wipawel@xxxxxxxxx>
    Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
 xen/common/livepatch.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xen/common/livepatch.c b/xen/common/livepatch.c
index 2a8ab13879..5e09dc990b 100644
--- a/xen/common/livepatch.c
+++ b/xen/common/livepatch.c
@@ -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 )
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog