[Intel-gfx] [PATCH] HAX: kernel/swsusp: Show invalid swap signature

[Chris Wilson]

---
 kernel/power/swap.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index d7cdc426ee38..1eed3fa04e21 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -306,9 +306,12 @@ static int mark_swapfiles(struct swap_map_handle *handle, 
unsigned int flags)
 {
        int error;
 
-       hib_submit_io(REQ_OP_READ, 0, swsusp_resume_block,
-                     swsusp_header, NULL);
-       if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
+       error = hib_submit_io(REQ_OP_READ, 0, swsusp_resume_block,
+                             swsusp_header, NULL);
+       if (error) {
+               printk(KERN_ERR "PM: Unable to read Swap header, error %d.\n",
+                      error);
+       } else if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
            !memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
                memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
                memcpy(swsusp_header->sig, HIBERNATE_SIG, 10);
@@ -319,7 +322,8 @@ static int mark_swapfiles(struct swap_map_handle *handle, 
unsigned int flags)
                error = hib_submit_io(REQ_OP_WRITE, REQ_SYNC,
                                      swsusp_resume_block, swsusp_header, NULL);
        } else {
-               printk(KERN_ERR "PM: Swap header not found!\n");
+               printk(KERN_ERR "PM: Swap header not found! Found %10s 
instead.\n",
+                      swsusp_header->sig);
                error = -ENODEV;
        }
        return error;
-- 
2.15.0.rc2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx