diff options
Diffstat (limited to '0043-libxl-check-return-value-of-libxl__xs_directory-in-n.patch')
-rw-r--r-- | 0043-libxl-check-return-value-of-libxl__xs_directory-in-n.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/0043-libxl-check-return-value-of-libxl__xs_directory-in-n.patch b/0043-libxl-check-return-value-of-libxl__xs_directory-in-n.patch new file mode 100644 index 0000000..0c2470a --- /dev/null +++ b/0043-libxl-check-return-value-of-libxl__xs_directory-in-n.patch @@ -0,0 +1,38 @@ +From 744accad1b73223b3261e3e678e16e030d83b179 Mon Sep 17 00:00:00 2001 +From: Anthony PERARD <anthony.perard@citrix.com> +Date: Tue, 12 Jul 2022 11:16:30 +0200 +Subject: [PATCH 43/51] libxl: check return value of libxl__xs_directory in + name2bdf + +libxl__xs_directory() can potentially return NULL without setting `n`. +As `n` isn't initialised, we need to check libxl__xs_directory() +return value before checking `n`. Otherwise, `n` might be non-zero +with `bdfs` NULL which would lead to a segv. + +Fixes: 57bff091f4 ("libxl: add 'name' field to 'libxl_device_pci' in the IDL...") +Reported-by: "G.R." <firemeteor@users.sourceforge.net> +Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> +Reviewed-by: Juergen Gross <jgross@suse.com> +Tested-by: "G.R." <firemeteor@users.sourceforge.net> +master commit: d778089ac70e5b8e3bdea0c85fc8c0b9ed0eaf2f +master date: 2022-07-12 08:38:51 +0200 +--- + tools/libs/light/libxl_pci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c +index 4bbbfe9f168f..ce3bf7c0ae81 100644 +--- a/tools/libs/light/libxl_pci.c ++++ b/tools/libs/light/libxl_pci.c +@@ -859,7 +859,7 @@ static int name2bdf(libxl__gc *gc, libxl_device_pci *pci) + int rc = ERROR_NOTFOUND; + + bdfs = libxl__xs_directory(gc, XBT_NULL, PCI_INFO_PATH, &n); +- if (!n) ++ if (!bdfs || !n) + goto out; + + for (i = 0; i < n; i++) { +-- +2.35.1 + |