Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfe9162e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "seemp: adjust hypervisor rooting report format"

parents 62114105 414df744

drivers/platform/msm/seemp_core/seemp_logk.c

+7 −6
Original line number Diff line number Diff line
@@ -624,16 +624,17 @@ static int seemp_logk_rtic_thread(void *data) 


			/* determine legitimacy of report */

			if (report->report_valid &&

				report->sequence_number <=

					header->num_incidents &&

				(last_sequence_number == 0

					|| report->sequence_number >

						last_sequence_number)) {

				seemp_logk_rtic(report->report_type,

					report->report.incident.actor,

					report->report.incident.asset_id,

					report->report.incident.asset_category,

					report->report.incident.response);

					report->actor,

					/* leave this empty until

					 * asset id is provided

					 */

					"",

					report->asset_category,

					report->response);

				last_sequence_number = report->sequence_number;

			} else {

				last_pos = cur_pos - 1;

drivers/platform/msm/seemp_core/seemp_logk.h

+5 −21
Original line number Diff line number Diff line
@@ -164,39 +164,23 @@ struct el2_report_header_t { 
	__u64 report_version;     /* Version of the EL2 report */

	__u64 mp_catalog_version;

		/* Version of MP catalogue used for kernel protection */

	__u64 num_incidents;      /* Number of Incidents Observed by EL2 */

	__u8 protection_enabled;  /* Kernel Assets protected by EL2 */

	__u8 pad1;

	__u8 pad2;

	__u8 pad3;

	__u32 pad4;

	__u64 num_incidents;      /* Number of Incidents Observed by EL2 */

};



/* individual report contents */

union el2_report {

	struct {

		__u8 asset_id[0x20]; /* Asset Identifier */

		__u64 actor;

			/* Actor that caused the Incident.  */

		__u8 asset_category; /* Asset Category */

		__u8 response;       /* Response From EL2 */

		__u16 pad1;

		__u32 pad2;

	} incident;

	struct {

		__u64 reserved;      /* TBD */

	} info;

};



/* individual report */

struct el2_report_data_t {

	__u64 sequence_number; /* Sequence number of the report */

	__u64 actor; /* Actor that caused the Incident.  */

	__u8 report_valid;

		/* Flag to indicate whether report instance is valid */

	__u8 report_type;        /* Report Type */

	__u8 pad1;

	__u8 pad2;

	__u64 sequence_number;   /* Sequence number of the report */

	union el2_report report;       /* Report Contents */

	__u8 asset_category; /* Asset Category */

	__u8 response;       /* Response From EL2 */

};



#endif