PM / hibernate: Avoid overflow in hibernate_preallocate_memory
Subsystems (2)
PATCH 1/1 PM / hibernate: Avoid overflow in hibernate_preallocate_memory
When system has a lot of highmem(e.g. 16GiB using a 32 bits kernel), the code to calculate how much memory we need to preallocate in normal zone may cause overflow. As Leon has analysed:
"
It looks that during computing 'alloc' variable there is overflow:
alloc = (3943404 - 1970542) - 1978280 = -5418 (signed)
And this function goes to err_out.
"
Fix this by avoiding that overflow.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=60817
--- kernel/power/snapshot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/power/snapshot.c +2 -1
@@ -1402,7 +1402,8 @@ int hibernate_preallocate_memory(void)* highmem and non-highmem zones separately. */ pages_highmem =preallocate_image_highmem (highmem /2 ); - alloc = (count - max_size) - pages_highmem; + alloc = (count - max_size) > pages_highmem ? + (count - max_size - pages_highmem) :0 ; pages =preallocate_image_memory (alloc, avail_normal);if (pages < alloc) {/* We have exhausted non-highmem pages, try highmem. */
Signature · 1 line
1.8.4.39.ga0d3f10
Quoted 23 lines · Aaron Lu
When system has a lot of highmem(e.g. 16GiB using a 32 bits kernel), the code to calculate how much memory we need to preallocate in normal zone may cause overflow. As Leon has analysed:
"
It looks that during computing 'alloc' variable there is overflow:
alloc = (3943404 - 1970542) - 1978280 = -5418 (signed)
And this function goes toerr_out.
"
Fix this by avoiding that overflow.Reference: https://bugzilla.kernel.org/show_bug.cgi?id=60817
Reported-and-tested-by Leon Drugi <[email protected]>Cc stable <[email protected]>Signed-off-by Aaron Lu <[email protected]>--- kernel/power/snapshot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)kernel/power/snapshot.c +0
-0
kernel/power/snapshot.c int hibernate_preallocate_memory(void) · line 1406
Quoted 6 lines
kernel/power/snapshot.c +2
-1@@ -1402,7 +1402,8 @@ int hibernate_preallocate_memory(void)* highmem and non-highmem zones separately. */ pages_highmem =preallocate_image_highmem (highmem /2 ); - alloc = (count - max_size) - pages_highmem; + alloc = (count - max_size) > pages_highmem ? + (count - max_size - pages_highmem) :0 ;
Well, what about
alloc = count - max_size; if (alloc > pages_highmem) alloc -= pages_highmem; else alloc = 0;
Quoted 4 lines
kernel/power/snapshot.c +0
-0pages =preallocate_image_memory (alloc, avail_normal);if (pages < alloc) {/* We have exhausted non-highmem pages, try highmem. */
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
PATCH 1/1 PM / hibernate: Avoid overflow in hibernate_preallocate_memory
Quoted 8 lines · Rafael J. Wysocki
Review
Quoted 4 lines · Aaron Lu
(quoted diff) +2
-1pages_highmem = preallocate_image_highmem(highmem / 2); - alloc = (count - max_size) - pages_highmem; + alloc = (count - max_size) > pages_highmem ? + (count - max_size - pages_highmem) : 0;Well, what about
Quoted 6 lines
alloc = count - max_size; if (alloc > pages_highmem) alloc -= pages_highmem; else alloc = 0;
OK, here it comes:
From: Aaron Lu <[email protected]>
Subject: [PATCH] PM / hibernate: Avoid overflow in hibernate_preallocate_memory
When system has a lot of highmem(e.g. 16GiB using a 32 bits kernel), the code to calculate how much memory we need to preallocate in normal zone may cause overflow. As Leon has analysed:
"
It looks that during computing 'alloc' variable there is overflow:
alloc = (3943404 - 1970542) - 1978280 = -5418 (signed)
And this function goes to err_out.
"
Fix this by avoiding that overflow.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=60817
--- kernel/power/snapshot.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/power/snapshot.c +5 -1
@@ -1402,7 +1402,11 @@ int hibernate_preallocate_memory(void)* highmem and non-highmem zones separately. */ pages_highmem =preallocate_image_highmem (highmem /2 ); - alloc = (count - max_size) - pages_highmem; + alloc = count - max_size; +if (alloc > pages_highmem) + alloc -= pages_highmem; +else + alloc =0 ; pages =preallocate_image_memory (alloc, avail_normal);if (pages < alloc) {/* We have exhausted non-highmem pages, try highmem. */
Signature · 1 line
1.8.4.39.ga0d3f10