kexec: clear crashk_res if all its memory has been released
authorZhen Lei <thunder.leizhen@huawei.com>
Sat, 27 May 2023 12:34:36 +0000 (20:34 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Sat, 10 Jun 2023 00:44:23 +0000 (17:44 -0700)
If the resource of crashk_res has been released, it is better to clear
crashk_res.start and crashk_res.end.  Because 'end = start - 1' is not
reasonable, and in some places the test is based on crashk_res.end, not
resource_size(&crashk_res).

Link: https://lkml.kernel.org/r/20230527123439.772-4-thunder.leizhen@huawei.com
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Cong Wang <amwang@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
kernel/kexec_core.c

index d1ab139dd49035ecb439a468da820007cbf7db64..bcc86a250ab3bf96023a0089ef25f1218a80de53 100644 (file)
@@ -1137,15 +1137,18 @@ int crash_shrink_memory(unsigned long new_size)
        end = start + new_size;
        crash_free_reserved_phys_range(end, crashk_res.end);
 
-       if (start == end)
-               release_resource(&crashk_res);
-
        ram_res->start = end;
        ram_res->end = crashk_res.end;
        ram_res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM;
        ram_res->name = "System RAM";
 
-       crashk_res.end = end - 1;
+       if (start == end) {
+               release_resource(&crashk_res);
+               crashk_res.start = 0;
+               crashk_res.end = 0;
+       } else {
+               crashk_res.end = end - 1;
+       }
 
        insert_resource(&iomem_resource, ram_res);