diff options
| -rw-r--r-- | kexec/kexec.c | 8 | ||||
| -rw-r--r-- | kexec/kexec.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/kexec/kexec.c b/kexec/kexec.c index 02076081..fdb4c984 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -689,6 +689,14 @@ static void update_purgatory(struct kexec_info *info) if (info->segment[i].mem == (void *)info->rhdr.rel_addr) { continue; } + + /* Don't include elfcorehdr in the checksum, if hotplug + * support enabled. + */ + if (do_hotplug && (info->segment[i].mem == (void *)info->elfcorehdr)) { + continue; + } + sha256_update(&ctx, info->segment[i].buf, info->segment[i].bufsz); nullsz = info->segment[i].memsz - info->segment[i].bufsz; diff --git a/kexec/kexec.h b/kexec/kexec.h index 487f707a..1004aff1 100644 --- a/kexec/kexec.h +++ b/kexec/kexec.h @@ -170,6 +170,7 @@ struct kexec_info { int command_line_len; int skip_checks; + unsigned long elfcorehdr; }; struct arch_map_entry { |