diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-13 08:24:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-13 08:24:50 -0700 |
| commit | 1f63dd8ca0dc05a8272bb8155f643c691d29bb11 (patch) | |
| tree | 5d648c12ce19c8b1ad6fddcc99eed94ceb2db27c /kernel | |
| parent | 1d5dcaa3bd65f2e8c9baa14a393d3a2dc5db7524 (diff) | |
| parent | 7b0b68b2b95606e65594958686833e53423f58f2 (diff) | |
| download | linux-1f63dd8ca0dc05a8272bb8155f643c691d29bb11.tar.gz linux-1f63dd8ca0dc05a8272bb8155f643c691d29bb11.zip | |
Merge tag 'fixes-2026-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux
Pull liveupdate fixes from Mike Rapoport:
"A few fixes for kexec handover and liveupdate:
- make sure KHO is skipped for crash kernel
- fix error reporting in memfd preservation if it fails mid-loop
- don't allow preserving memfds whose page count exceeds UINT_MAX
- fix documentation of memfd seals preservation to match the code"
* tag 'fixes-2026-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux:
mm/memfd_luo: document preservation of file seals
mm/memfd_luo: reject memfds whose page count exceeds UINT_MAX
mm/memfd_luo: report error when restoring a folio fails mid-loop
kho: skip KHO for crash kernel
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/liveupdate/kexec_handover.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index 18509d8082ea..2592f7ca16e2 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -1707,7 +1707,7 @@ int kho_fill_kimage(struct kimage *image) int err = 0; struct kexec_buf scratch; - if (!kho_enable) + if (!kho_enable || image->type == KEXEC_TYPE_CRASH) return 0; image->kho.fdt = virt_to_phys(kho_out.fdt); |