Skip to content

xenbus: Fix handling of requests with xsd_sockmsg.len = 0 for socket connections #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
last-genius merged 1 commit into from
Jul 14, 2026
Merged

xenbus: Fix handling of requests with xsd_sockmsg.len = 0 for socket connections #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions xenbus/xb.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,11 @@ let can_input con = Queue.can_push con.pkt_out CommandReply

(* NB: can throw Reconnect *)
let input con =
let reset_and_return partial_pkt =
let pkt = Packet.of_partialpkt partial_pkt in
con.partial_in <- init_partial_in () ;
Some pkt
in
if not (can_input con) then
None
else
Expand All @@ -309,23 +314,27 @@ let input con =
(* we complete the data *)
if sz > 0 then
Partial.append partial_pkt (Bytes.to_string b) sz ;
if Partial.to_complete partial_pkt = 0 then (
let pkt = Packet.of_partialpkt partial_pkt in
con.partial_in <- init_partial_in () ;
Some pkt
) else
if Partial.to_complete partial_pkt = 0 then
reset_and_return partial_pkt
else
None
| NoHdr (i, buf) ->
(* we complete the partial header *)
if sz > 0 then
Bytes.blit b 0 buf (Partial.header_size () - i) sz ;
con.partial_in <-
( if sz = i then
HaveHdr (Partial.of_string (Bytes.to_string buf))
else
NoHdr (i - sz, buf)
) ;
None
if sz = i then
let partial_pkt = Partial.of_string (Bytes.to_string buf) in
(* If there is no body, we can return the full request immediately *)
if Partial.to_complete partial_pkt = 0 then
reset_and_return partial_pkt
else (
con.partial_in <- HaveHdr partial_pkt ;
None
)
else (
con.partial_in <- NoHdr (i - sz, buf) ;
None
)

let classify t =
match t.Packet.ty with Op.Watchevent -> Watchevent | _ -> CommandReply
Expand Down
Loading