plugins/ocp: Align ocp_smart_extended_log struct.

If the dssd point, minor version are declared as __le16, the alignment will be broken. Remove __packed keyword. Reported-by: Steven Seungcheol Lee <[email protected]> Signed-off-by: Minsik Jeon <[email protected]>
linux-nvme · Dec 23, 2024 · 744994b · 744994b
1 parent 65d7e7d
commit 744994b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/plugins/ocp/ocp-print-json.c b/plugins/ocp/ocp-print-json.c
@@ -230,9 +230,9 @@ static void json_smart_extended_log_v1(struct ocp_smart_extended_log *log)
 		json_object_add_value_uint(root, "Errata Version Field",
 						log->dssd_errata_version);
 		json_object_add_value_uint(root, "Point Version Field",
-						le16_to_cpu(log->dssd_point_version));
+						le16_to_cpu(*(uint16_t *)&log->dssd_point_version));
 		json_object_add_value_uint(root, "Minor Version Field",
-						le16_to_cpu(log->dssd_minor_version));
+						le16_to_cpu(*(uint16_t *)&log->dssd_minor_version));
 		json_object_add_value_uint(root, "Major Version Field",
 						log->dssd_major_version);
 		json_object_add_value_uint(root, "NVMe Base Errata Version",
@@ -341,9 +341,9 @@ static void json_smart_extended_log_v2(struct ocp_smart_extended_log *log)
 		json_object_add_value_uint(root, "errata_version_field",
 						log->dssd_errata_version);
 		json_object_add_value_uint(root, "point_version_field",
-						le16_to_cpu(log->dssd_point_version));
+						le16_to_cpu(*(uint16_t *)&log->dssd_point_version));
 		json_object_add_value_uint(root, "minor_version_field",
-						le16_to_cpu(log->dssd_minor_version));
+						le16_to_cpu(*(uint16_t *)&log->dssd_minor_version));
 		json_object_add_value_uint(root, "major_version_field",
 						log->dssd_major_version);
 		json_object_add_value_uint(root, "nvme_base_errata_version",

diff --git a/plugins/ocp/ocp-print-stdout.c b/plugins/ocp/ocp-print-stdout.c
@@ -177,9 +177,9 @@ static void stdout_smart_extended_log(struct ocp_smart_extended_log *log, unsign
 		printf("  Errata Version Field                          %d\n",
 			log->dssd_errata_version);
 		printf("  Point Version Field                           %"PRIu16"\n",
-			le16_to_cpu(log->dssd_point_version));
+			le16_to_cpu(*(uint16_t *)&log->dssd_point_version));
 		printf("  Minor Version Field                           %"PRIu16"\n",
-			le16_to_cpu(log->dssd_minor_version));
+			le16_to_cpu(*(uint16_t *)&log->dssd_minor_version));
 		printf("  Major Version Field                           %d\n",
 			log->dssd_major_version);
 		printf("  NVMe Base Errata Version                      %d\n",

diff --git a/plugins/ocp/ocp-smart-extended-log.h b/plugins/ocp/ocp-smart-extended-log.h
@@ -58,7 +58,7 @@ struct plugin;
  * @log_page_version:			Log page version
  * @log_page_guid:			Log page GUID
  */
-struct __packed ocp_smart_extended_log {
+struct ocp_smart_extended_log {
 	__u8   physical_media_units_written[16];	/* [15:0] */
 	__u8   physical_media_units_read[16];		/* [31:16] */
 	__u8   bad_user_nand_blocks_raw[6];		/* [37:32] */
@@ -77,8 +77,8 @@ struct __packed ocp_smart_extended_log {
 	__u8   thermal_throttling_event_count;		/* [96] */
 	__u8   thermal_throttling_current_status;	/* [97] */
 	__u8   dssd_errata_version;			/* [98] */
-	__le16 dssd_point_version;			/* [100:99] */
-	__le16 dssd_minor_version;			/* [102:101] */
+	__u8   dssd_point_version[2];			/* [100:99] */
+	__u8   dssd_minor_version[2];			/* [102:101] */
 	__u8   dssd_major_version;			/* [103] */
 	__le64 pcie_correctable_err_count;		/* [111:104] */
 	__le32 incomplete_shoutdowns;			/* [115:112] */