[Xen-changelog] [xen master] libxl: Fix error path in libxl_device_events_handler

[patchbot@xxxxxxx]

commit c566ab68af7da089ae2b0ff664d02a93a0647584
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Wed Feb 19 14:03:29 2014 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Mar 12 14:11:31 2014 +0000

    libxl: Fix error path in libxl_device_events_handler
    
    libxl_device_events_handler would fail to call AO_ABORT if it failed;
    instead it would simply return rc.  (This leaves the egc etc. from the
    now-abolished stack frame potentially live, and leaves the ctx
    locked.)
    
    In xl, this is of no consequence, because xl will immediately exit in
    this situation.  This is very likely to be true in any other callers
    (of which we don't know of any, anyway).
    
    Coverity-ID: 1181840
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    CC: coverity@xxxxxxxxxxxxxx
---
 tools/libxl/libxl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 730f6e1..2d29ad2 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -3881,7 +3881,8 @@ int libxl_device_events_handler(libxl_ctx *ctx,
 
 out:
     GC_FREE;
-    return rc ? : AO_INPROGRESS;
+    if (rc) return AO_ABORT(rc);
+    return AO_INPROGRESS;
 }
 
 
/******************************************************************************/
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog