From 97fa5a193aa8dba036a2b66ea5aba8bc5e1fcf4a Mon Sep 17 00:00:00 2001 From: xuyong Date: Fri, 19 May 2023 19:33:44 +0800 Subject: [PATCH] fixed f9487fd from https://gitee.com/honghecun/kernel_linux_5.10/pulls/856 hisysevent: add pack to struct which would be serilized into raw data ohos inclusion category:bugfix issue:#I76UUQ CVE: NA Signed-off-by: xuyong --- drivers/staging/hisysevent/hisysevent_builder.h | 2 ++ drivers/staging/hisysevent/hisysevent_raw_data_encoder.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/staging/hisysevent/hisysevent_builder.h b/drivers/staging/hisysevent/hisysevent_builder.h index 7f90db1fb19f..e16115ad5c8b 100644 --- a/drivers/staging/hisysevent/hisysevent_builder.h +++ b/drivers/staging/hisysevent/hisysevent_builder.h @@ -17,6 +17,7 @@ #define MAX_DOMAIN_LENGTH 16 #define MAX_EVENT_NAME_LENGTH 32 +#pragma pack(1) struct hisysevent_header { /* event domain */ char domain[MAX_DOMAIN_LENGTH + 1]; @@ -48,6 +49,7 @@ struct hisysevent_header { /* trace info flag*/ u8 is_open_trace: 1; }; +#pragma pack() struct hisysevent_params { /* total count of parameters */ diff --git a/drivers/staging/hisysevent/hisysevent_raw_data_encoder.c b/drivers/staging/hisysevent/hisysevent_raw_data_encoder.c index 9ccc928962e6..ff0497e85409 100644 --- a/drivers/staging/hisysevent/hisysevent_raw_data_encoder.c +++ b/drivers/staging/hisysevent/hisysevent_raw_data_encoder.c @@ -32,6 +32,7 @@ enum hisysevent_encode_type { LENGTH_DELIMITED = 1, }; +#pragma pack(1) struct param_value_type { /* array flag */ u8 is_array: 1; @@ -42,6 +43,7 @@ struct param_value_type { /* byte count of parameter value */ u8 value_byte_cnt: 3; }; +#pragma pack() static u8 encode_tag(u8 type) { -- Gitee