swsusp: prevent possible image corruption on resume
Subsystems (2)
PATCH 1/1 swsusp: prevent possible image corruption on resume
The function free_pagedir() used by swsusp for freeing its internal data structures clears the PG_nosave and PG_nosave_free flags for each page being freed. However, during resume PG_nosave_free set means that the page in question is "unsafe" (ie. it will be overwritten in the process of restoring the saved system state from the image), so it should not be used for the image data. Therefore free_pagedir() should not clear PG_nosave_free if it's called during resume (otherwise "unsafe" pages freed by it may be used for storing the image data and the data may get corrupted later on).
--- kernel/power/snapshot.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
kernel/power/snapshot.c +5 -4
@@ -240,14 +240,15 @@ static void copy_data_pages(struct pbe ** free_pagedir - free pages allocated with alloc_pagedir() */ -static void free_pagedir (struct pbe *pblist) +static void free_pagedir (struct pbe *pblist,int clear_nosave_free) {struct pbe *pbe;while (pblist) { pbe = (pblist +PB_PAGE_SKIP )->next;ClearPageNosave (virt_to_page (pblist)); -ClearPageNosaveFree (virt_to_page (pblist)); +if (clear_nosave_free) +ClearPageNosaveFree (virt_to_page (pblist));free_page ((unsigned long )pblist); pblist = pbe; }
@@ -389,7 +390,7 @@ struct pbe *alloc_pagedir(unsigned int n pbe->next =alloc_image_page (gfp_mask, safe_needed); }if (!pbe) {/* get_zeroed_page() failed */ -free_pagedir (pblist); +free_pagedir (pblist,1 ); pblist =NULL ; }else create_pbe_list (pblist, nr_pages);
@@ -736,7 +737,7 @@ static int create_image(struct snapshot_ pblist =alloc_pagedir (nr_copy_pages,GFP_ATOMIC ,1 );if (pblist)copy_page_backup_list (pblist, p); -free_pagedir (p); +free_pagedir (p,0 );if (!pblist) error = -ENOMEM ; }
Hi!
Quoted 8 lines
The function
free_pagedir()used by swsusp for freeing its internal data structures clears thePG_nosaveandPG_nosave_freeflags for each page being freed. However, during resumePG_nosave_freeset means that the page in question is "unsafe" (ie. it will be overwritten in the process of restoring the saved system state from the image), so it should not be used for the image data. Thereforefree_pagedir()should not clearPG_nosave_freeif it's called during resume (otherwise "unsafe" pages freed by it may be used for storing the image data and the data may get corrupted later on).
Okay with me.
Pavel
Signature · 1 line
Thanks for all the (sleeping) penguins.