[Xen-changelog] [xen-unstable] oxenstored: Enforce a maximum message size of 4096 bytes

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1360246907 0
# Node ID ffd30e7388ade86a3534945caff7daaab8cbba3a
# Parent  2c0fd406f02cabed45a09f7afd3b09af271adfc3
oxenstored: Enforce a maximum message size of 4096 bytes

The maximum size of a message is part of the protocol spec in
  xen/include/public/io/xs_wire.h

Before this patch a client which sends an overly large message can
cause a buffer read overrun.

Note if a badly-behaved client sends a very large message
then it will be difficult for them to make their connection
work again-- they will probably need to reboot.

Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>
Acked-by: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 2c0fd406f02c -r ffd30e7388ad tools/ocaml/libs/xb/partial.ml
--- a/tools/ocaml/libs/xb/partial.ml    Thu Feb 07 14:21:44 2013 +0000
+++ b/tools/ocaml/libs/xb/partial.ml    Thu Feb 07 14:21:47 2013 +0000
@@ -27,8 +27,15 @@ external header_size: unit -> int = "stu
 external header_of_string_internal: string -> int * int * int * int
          = "stub_header_of_string"
 
+let xenstore_payload_max = 4096 (* xen/include/public/io/xs_wire.h *)
+
 let of_string s =
        let tid, rid, opint, dlen = header_of_string_internal s in
+       (* A packet which is bigger than xenstore_payload_max is illegal.
+          This will leave the guest connection is a bad state and will
+          be hard to recover from without restarting the connection
+          (ie rebooting the guest) *)
+       let dlen = min xenstore_payload_max dlen in
        {
                tid = tid;
                rid = rid;
@@ -38,6 +45,7 @@ let of_string s =
        }
 
 let append pkt s sz =
+       if pkt.len > 4096 then failwith "Buffer.add: cannot grow buffer";
        Buffer.add_string pkt.buf (String.sub s 0 sz)
 
 let to_complete pkt =

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