Fix namespace lookup issue when using Windows SCM2 driver.

iset cookie calculation was broken because of incorrect pointer usage.
Swapped SCM and Legacy driver check priority. Now SCM2 driver is first check.

Signed-off-by: Kelly J couch <[email protected]>

Author: kellycouch

src/lib/namespace.c

@@ -326,7 +326,7 @@ int nvm_get_namespace_details(const NVM_UID namespace_uid, struct namespace_deta
 				free(p_pool);
 			}
 			// update the context
-			if (rc)
+			if (NVM_SUCCESS == rc)
 			{
 				set_nvm_context_namespace_details(namespace_uid, p_namespace);
 			}

src/lib/namespace_labels.c

@@ -332,11 +332,12 @@ void calculate_iset_cookies(struct ns_data **pp_ns_data)
 	{
 		struct nvm_interleave_set *p_set = &(*pp_ns_data)->iset_list[iset_idx];
 
-		struct v1_1_cookie_data *data_v1_1 = malloc(p_set->dimm_count * sizeof(struct v1_1_cookie_data));
-		NVM_SIZE data_v1_1_size = sizeof (struct v1_1_cookie_data) * p_set->dimm_count;
+		NVM_SIZE data_v1_1_size = sizeof(struct v1_1_cookie_data) * p_set->dimm_count;
+		struct v1_1_cookie_data *data_v1_1 = malloc(data_v1_1_size);
 		memset(data_v1_1, 0, data_v1_1_size);
-		struct v1_2_cookie_data *data_v1_2 = malloc(p_set->dimm_count * sizeof(struct v1_2_cookie_data));
-		NVM_SIZE data_v1_2_size = sizeof (struct v1_2_cookie_data) * p_set->dimm_count;
+
+		NVM_SIZE data_v1_2_size = sizeof(struct v1_2_cookie_data) * p_set->dimm_count;
+		struct v1_2_cookie_data *data_v1_2 = malloc(data_v1_2_size);
 		memset(data_v1_2, 0, data_v1_2_size);
 
 		for (int dimm_idx = 0; dimm_idx < p_set->dimm_count; dimm_idx++)
@@ -352,11 +353,8 @@ void calculate_iset_cookies(struct ns_data **pp_ns_data)
 				data_v1_2[dimm_idx].region_offset = p_set->dimm_region_offsets[dimm_idx];
 				memmove(&data_v1_2[dimm_idx].serial_number,
 					dimm.serial_number, sizeof (NVM_SERIAL_NUMBER));
-				data_v1_2[dimm_idx].vendor_id = dimm.vendor_id;
-				data_v1_2[dimm_idx].vendor_id = SWAP_SHORT(data_v1_2[dimm_idx].vendor_id);
-				data_v1_2[dimm_idx].manufacturing_date = dimm.manufacturing_date;
-				data_v1_2[dimm_idx].manufacturing_date =
-						SWAP_SHORT(data_v1_2[dimm_idx].manufacturing_date);
+				data_v1_2[dimm_idx].vendor_id = SWAP_SHORT(dimm.vendor_id);
+				data_v1_2[dimm_idx].manufacturing_date = SWAP_SHORT(dimm.manufacturing_date);
 				data_v1_2[dimm_idx].manufacturing_location = dimm.manufacturing_location;
 			}
 		}
@@ -365,8 +363,8 @@ void calculate_iset_cookies(struct ns_data **pp_ns_data)
 		sort_cookie_data(data_v1_1, data_v1_2, p_set->dimm_count);
 
 		// cookie is the fletcher64 checksum of the cookie data data
-		checksum_fletcher64((void *)&data_v1_1, data_v1_1_size, &p_set->cookie_v1_1, 1);
-		checksum_fletcher64((void *)&data_v1_2, data_v1_2_size, &p_set->cookie_v1_2, 1);
+		checksum_fletcher64((void *)data_v1_1, data_v1_1_size, &p_set->cookie_v1_1, 1);
+		checksum_fletcher64((void *)data_v1_2, data_v1_2_size, &p_set->cookie_v1_2, 1);
 
         free(data_v1_1);
         free(data_v1_2);

src/lib/win_adapter.c

@@ -64,8 +64,8 @@ enum DRIVER_TYPE get_driver_type()
 
 NVM_BOOL is_supported_driver_available()
 {
-	NVM_BOOL result = (NVM_BOOL) (win_leg_adp_is_supported_driver_available() ||
-			win_scm_adp_is_supported_driver_available());
+	NVM_BOOL result = (NVM_BOOL) (win_scm_adp_is_supported_driver_available() ||
+		win_leg_adp_is_supported_driver_available());
 	return result;
 }