compare mem_topology sizes before memcmp on the contents

Xilinx · Oct 5, 2018 · b2998d9 · b2998d9
1 parent b60c915
commit b2998d9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/runtime_src/driver/xclng/drm/xocl/userpf/xocl_ioctl.c b/src/runtime_src/driver/xclng/drm/xocl/userpf/xocl_ioctl.c
@@ -548,9 +548,8 @@ xocl_read_axlf_helper(struct xocl_dev *xdev, struct drm_xocl_axlf *axlf_ptr)
 
 	/* Compare MEM_TOPOLOGY previous vs new. Ignore this and keep disable preserve_mem if not for aws.*/
 	if (xocl_is_aws(xdev) && (xdev->topology != NULL)) {
-		// m_mem_data can be of different length but we would not compare them if topology match fails
-		if (!memcmp(new_topology, xdev->topology, size) &&
-		    (sizeof_sect(new_topology, m_mem_data) == sizeof_sect(xdev->topology, m_mem_data))) {
+		if ( (size == sizeof_sect(xdev->topology, m_mem_data)) &&
+		    !memcmp(new_topology, xdev->topology, size) ) {
 			printk(KERN_INFO "XOCL: MEM_TOPOLOGY match, preserve mem_topology.\n");
 			preserve_mem = 1;
 		} else {