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

[XEN][PATCH v8 02/19] common/device_tree.c: unflatten_device_tree() propagate errors


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Vikram Garhwal <vikram.garhwal@xxxxxxx>
  • Date: Wed, 16 Aug 2023 17:39:30 -0700
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=zNJuXj7ZBUQRHz29zlrzeHOa0+tHLK1DzkscWEXkjVw=; b=ZwU47WiDLVyJHGgHGAfPew5vkZTbO7QEMqSLccakl4Q2kdL1OrE5kLDWqR1uuc4k9WNlYXry/aCB5E/GC6bnfVru8aBYrfDoRpkIxYS8GiUuzAYVACARISFMRi5tlgkShysrHxq7qv6QKDoQ7tjzU60c5/mQp+ZDubv2Uas+cvW0tXw5mpJO8GDzZP1f2sv9kM8IVjAWLtehpiN8c/P7vj39GIK5vC/OYkDaVLyH7w/iOpW5lUm4nWux+mCmjv3K11xC4Op7u8M0uhn+ujF4KhKVnfByl5mNCOORr+WVUc4JrNFMbo+YsTQ7C+7V+S1sQ97grAO77EDpkLBEZ6L73w==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lf9Mj3Io8VeqRps2D5PsKJ8PgrKlRx6PhFoJt6Pazdm2rM1fBdHf3WPU2oGkObjPSz97wsP5NBAzojpqb5mr5P1r7AqM9PR8DucYGyHkfkQ2Wc66HLV71dKNfSv7yniJWSLeyWu3R5wa/oFaFEc9Ef95xs2GOPhTHJklSA15ROpT3Ma43Qj6wvXO+3FRd97fJRJTpdW0sjn3EkMtlhx02OJkETnSeH1cU5pUoJ3kvx0AJUdmbH5mG0F/5QkkQlWNe0rgyenRTCOEQNM9JhCtBPUf9waBY3yKH9MeoplZ5kuevxt2Gpg49YbYdKKzK3KSGt7i+IucVpaX3fyel4OVtw==
  • Cc: <michal.orzel@xxxxxxx>, <sstabellini@xxxxxxxxxx>, <vikram.garhwal@xxxxxxx>, Julien Grall <julien@xxxxxxx>
  • Delivery-date: Thu, 17 Aug 2023 00:40:16 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

This will be useful in dynamic node programming when new dt nodes are unflattend
during runtime. Invalid device tree node related errors should be propagated
back to the caller.

Signed-off-by: Vikram Garhwal <vikram.garhwal@xxxxxxx>

---
Changes from v7:
    Free allocated memory in case of errors when calling unflatten_dt_node.
---
---
 xen/common/device_tree.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index c91d54c493..cd9a6a5c93 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -2108,6 +2108,9 @@ static int __init __unflatten_device_tree(const void *fdt,
     /* First pass, scan for size */
     start = ((unsigned long)fdt) + fdt_off_dt_struct(fdt);
     size = unflatten_dt_node(fdt, 0, &start, NULL, NULL, 0);
+    if ( !size )
+        return -EINVAL;
+
     size = (size | 3) + 1;
 
     dt_dprintk("  size is %#lx allocating...\n", size);
@@ -2125,11 +2128,21 @@ static int __init __unflatten_device_tree(const void 
*fdt,
     start = ((unsigned long)fdt) + fdt_off_dt_struct(fdt);
     unflatten_dt_node(fdt, mem, &start, NULL, &allnextp, 0);
     if ( be32_to_cpup((__be32 *)start) != FDT_END )
-        printk(XENLOG_WARNING "Weird tag at end of tree: %08x\n",
+    {
+        printk(XENLOG_ERR "Weird tag at end of tree: %08x\n",
                   *((u32 *)start));
+        xfree((__be64 *)mem);
+        return -EINVAL;
+    }
+
     if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeefU )
-        printk(XENLOG_WARNING "End of tree marker overwritten: %08x\n",
+    {
+        printk(XENLOG_ERR "End of tree marker overwritten: %08x\n",
                   be32_to_cpu(((__be32 *)mem)[size / 4]));
+        xfree((__be64 *)mem);
+        return -EINVAL;
+    }
+
     *allnextp = NULL;
 
     dt_dprintk(" <- unflatten_device_tree()\n");
-- 
2.17.1




 


Rackspace

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