[Xen-changelog] Do not BUG when receiving unexpected message type from xenbus

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User vhanquez@xxxxxxxxxxxxxxxxxxxxxxx
# Node ID 890fa761ba82a26988b1a5cb5ec0359706f75df8
# Parent  f00e257d200c0178e15eb32a0cb1fbf66e739971
Do not BUG when receiving unexpected message type from xenbus
print a warning and discard the query

Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>

diff -r f00e257d200c -r 890fa761ba82 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c       Wed Mar 15 
10:33:43 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c       Wed Mar 15 
11:09:45 2006
@@ -237,7 +237,14 @@
                return ERR_PTR(-err);
        }
 
-       BUG_ON(msg.type != type);
+       if (msg.type != type) {
+               if (printk_ratelimit())
+                       printk(KERN_WARNING
+                              "XENBUS unexpected type [%d], expected [%d]\n",
+                              msg.type, type);
+               kfree(ret);
+               return ERR_PTR(-EINVAL);
+       }
        return ret;
 }
 

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