From: Matthew Daley <mattjd@gmail.com>
Date: Tue, 10 Sep 2013 14:34:19 +0000 (+1200)
Subject: mini-os: fix use-after-free in xs_daemon_close event iteration
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6370^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=72b9c3e88c1cd205b39b178ce5e684868a1117c2;p=xen.git

mini-os: fix use-after-free in xs_daemon_close event iteration

We need to get the next pointer before the freeing of the event.

Coverity-ID: 1056173
Signed-off-by: Matthew Daley <mattjd@gmail.com>
Acked-By: Samuel Thibault <samuel.thibault@ens-lyon.org>
---

diff --git a/extras/mini-os/lib/xs.c b/extras/mini-os/lib/xs.c
index a2a122098c..c603d178bf 100644
--- a/extras/mini-os/lib/xs.c
+++ b/extras/mini-os/lib/xs.c
@@ -29,9 +29,12 @@ struct xs_handle *xs_daemon_open()
 void xs_daemon_close(struct xs_handle *h)
 {
     int fd = _xs_fileno(h);
-    struct xenbus_event *event;
-    for (event = files[fd].xenbus.events; event; event = event->next)
+    struct xenbus_event *event, *next;
+    for (event = files[fd].xenbus.events; event; event = next)
+    {
+        next = event->next;
         free(event);
+    }
     files[fd].type = FTYPE_NONE;
 }