[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH for-4.21] tools/xl: fix for dead code in list_domains_details()


  • To: xen-devel@xxxxxxxxxxxxxxxxxxxx
  • From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Date: Mon, 20 Oct 2025 13:19:59 +0100
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W8lGfR1TvN2D25hNGTy1nzdUjimJEtQYwoLxwiFrF3Y=; b=QBTQUPk9vdLEuvK2N/pCzIYuujRqIW7XkOhZBOHVTKXgT70fiGpJVAMyU/y0g+21nsF8u4hVOZfkYwqEhv/1ijkZAy7csTxd0NSazmeMo0/lMgaVx+O8H9bvfHiiT0Ybx5+CrGJjfqIVilfCJXPUg1pzRrIFiPrVRi1rbp0ZcC/sLyOtceYCcM/if2dvlXMvwGXR/K2YBLAs0ziA2/ShAc5WT3Rh22PL1NL6F4UCB/g+0Xlq7REW9z5AB/M5ehxOJoD9sHVanob84yFy7riuSNDXkNNP1xU+v7oCs7bRSXcCybpO4Di36ftHxOW+2LBtCGQrJIONDim4ROe6/a0X4g==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Xoz8ZYlsPE9MHCrFKzHGagRH6WRYIIOm9GtMNoFHauMHj5IfwX01GV0O46P4bZo1dv3duZvbyH1SDzyhvvV87ciAXHwQnVcPHKd1nkozNmZ1wTnWHAaIHXaUCu01HC0xT9/pCCih1bKvEzfY/fIpkslyIAsnylaC6IszZ7UmvfYrMtGRnQKDlO2Gm4qUjPSr96CzHjo/tqTDBabBLUbGtv/axg6tw7o1P+XLZrkJ5eiFq2OK6oGhVMhZUO5b5N9Yegn16W8wvekM4FlWFEowlm6XQ85+HrJVXOQXQTPRf2a/YT87c5zRH0pGzJQGuyhfNOP+rwrmhXD/oLi5KHwILw==
  • Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
  • Cc: oleksii.kurochko@xxxxxxxxx, Roger Pau Monne <roger.pau@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>
  • Delivery-date: Mon, 20 Oct 2025 12:21:35 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

Commit d0193c6d6716 introduced checking for the return value of
printf_info_one_json(), but failed to remove a further check down, which
now Coverity complains is dead code.

The correct fix is to make the call to json_object_array_add() conditional
on printf_info_one_json() having been successful, so that the further call
to libxl_domain_config_dispose() is not avoided.

CID: 1667251
Fixes: d0193c6d6716 ("tools/xl: check return value of printf_info_one_json() in 
list_domains_details()")
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
As with previous fixes, needs to be considered for 4.21.
---
 tools/xl/xl_info.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c
index dbb682cc52a6..98fc879e636c 100644
--- a/tools/xl/xl_info.c
+++ b/tools/xl/xl_info.c
@@ -584,9 +584,8 @@ static void list_domains_details(const libxl_dominfo *info, 
int nb_domain)
 #ifdef HAVE_LIBJSONC
             json_object *jso_value;
             rc = printf_info_one_json(&jso_value, info[i].domid, &d_config);
-            if (rc)
-                goto out;
-            json_object_array_add(jso, jso_value);
+            if (!rc)
+                json_object_array_add(jso, jso_value);
 #elif defined(HAVE_LIBYAJL)
             s = printf_info_one_json(hand, info[i].domid, &d_config);
 #endif
-- 
2.51.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.