diff options
| author | Thierry Strudel <tstrudel@google.com> | 2019-08-31 00:20:02 +0000 |
|---|---|---|
| committer | Thierry Strudel <tstrudel@google.com> | 2019-08-31 00:21:23 +0000 |
| commit | 3206e079fc69dda776bc2d89acc1d8c15d9f4ed3 (patch) | |
| tree | 4f41f503cca7aa6e71b60d96da28d25513983989 | |
| parent | 29817a0a3664394730a593d278dc9aa09761517d (diff) | |
Revert "fs:pstore:ramoops: fix incomplete appended ABL log"android-10.0.0_r0.6android-10.0.0_r0.5android-10.0.0_r0.12android-10.0.0_r0.10
This reverts commit c2f981566d59c7168cad56501af9b285f61810fa.
Reason for revert: This change was not approved for Q
Bug: 139402096
Change-Id: Id487defae5e0a80f285f1aa9122434f0b8ef4223
| -rw-r--r-- | fs/pstore/bldr_log.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/pstore/bldr_log.c b/fs/pstore/bldr_log.c index 05633c338225..8d31041db64e 100644 --- a/fs/pstore/bldr_log.c +++ b/fs/pstore/bldr_log.c @@ -28,11 +28,9 @@ /* Header structure defined in LK */ struct bldr_log_header { - unsigned int magic; - unsigned int offset; - unsigned int rotate_flag; - unsigned int buf_size; - char *buf_start; + __u32 magic; + __u32 offset; + __u32 rotate_flag; }; static char *bl_last_log_buf, *bl_cur_log_buf; @@ -73,13 +71,13 @@ static void bldr_log_parser(const char *bldr_log, char *bldr_log_buf, bldr_log_buf_ptr += bldr_log_bottom_size; /* Top half part */ - bldr_log_top_size = header->offset; + bldr_log_top_size = header->offset - sizeof(*header); memcpy(bldr_log_buf_ptr, bldr_log + sizeof(*header), bldr_log_top_size); *bldr_log_buf_size = bldr_log_bottom_size + bldr_log_top_size; } else { - *bldr_log_buf_size = header->offset; + *bldr_log_buf_size = header->offset - sizeof(*header); memcpy(bldr_log_buf, bldr_log + sizeof(*header), *bldr_log_buf_size); |