From: Edwin Török <edvin.torok@citrix.com>
Date: Tue, 15 Dec 2020 13:06:48 +0000 (+0100)
Subject: tools/ocaml/xenstored: unify watch firing
X-Git-Tag: archive/raspbian/4.14.1+11-gb0b734a8b3-1+rpi1^2~61^2~28
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6fa3e05ff5a8083a0be29ac66d4d94bb57e252f2;p=xen.git

tools/ocaml/xenstored: unify watch firing

This will make it easier insert additional checks in a follow-up patch.
All watches are now fired from a single function.

This is part of XSA-115.

Signed-off-by: Edwin Török <edvin.torok@citrix.com>
Acked-by: Christian Lindig <christian.lindig@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml
index 24750ada43..e5df62d9e7 100644
--- a/tools/ocaml/xenstored/connection.ml
+++ b/tools/ocaml/xenstored/connection.ml
@@ -210,8 +210,7 @@ let fire_watch watch path =
 		end else
 			path
 	in
-	let data = Utils.join_by_null [ new_path; watch.token; "" ] in
-	send_reply watch.con Transaction.none 0 Xenbus.Xb.Op.Watchevent data
+	fire_single_watch { watch with path = new_path }
 
 (* Search for a valid unused transaction id. *)
 let rec valid_transaction_id con proposed_id =