Skip to contentSkip to conversation

PM:hibernate:fix miss close 'hib_resume_bdev' in load_image_and_restore

PATCH Applied Ye Bin 2 participants 2 messages Feb 9, 2022 – Feb 16, 2022

Subsystems (2)
Suspend to RAM Hibernation
lore
Share & tools
lore

Ye Bin

author
#0 lore raw

PATCH 1/1 PM:hibernate:fix miss close 'hib_resume_bdev' in load_image_and_restore

As 'swsusp_check' open 'hib_resume_bdev', if call 'create_basic_memory_bitmaps' failed, we need to close 'hib_resume_bdev' in 'load_image_and_restore' function.

Signed-off-by Ye Bin <[email protected]>
---
 kernel/power/hibernate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/power/hibernate.c +3 -1
index e6af502c2fd7..49d1df0218cb 100644
@@ -689,8 +689,10 @@ static int load_image_and_restore(void)
 
 	lock_device_hotplug();
 	error = create_basic_memory_bitmaps();
-	if (error)
+	if (error) {
+		swsusp_close(FMODE_READ | FMODE_EXCL);
 		goto Unlock;
+	}
 
 	error = swsusp_read(&flags);
 	swsusp_close(FMODE_READ | FMODE_EXCL);
Signature · 1 line
2.31.1
maintainer Applied
#1 lore raw
Quoted 16 lines · Ye Bin

As 'swsusp_check' open 'hib_resume_bdev', if call 'create_basic_memory_bitmaps' failed, we need to close 'hib_resume_bdev' in 'load_image_and_restore' function.

Signed-off-by Ye Bin <[email protected]>
---
 kernel/power/hibernate.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/power/hibernate.c +0 -0
index e6af502c2fd7..49d1df0218cb 100644
@@ -689,8 +689,10 @@ static int load_image_and_restore(void)
 
        lock_device_hotplug();

kernel/power/hibernate.c static int load_image_and_restore(void)

Quoted 10 lines
kernel/power/hibernate.c +3 -2
        error = create_basic_memory_bitmaps();
-       if (error)
+       if (error) {
+               swsusp_close(FMODE_READ | FMODE_EXCL);
                goto Unlock;
+       }
 
        error = swsusp_read(&flags);
        swsusp_close(FMODE_READ | FMODE_EXCL);
--

Applied as 5.18 material, thanks!