Commit 749fa170 authored by Chen Yu's avatar Chen Yu Committed by Rafael J. Wysocki
Browse files

PM / hibernate: Check the success of generating md5 digest before hibernation 



Currently if get_e820_md5() fails, then it will hibernate nevertheless.
Actually the error code should be propagated to upper caller so that
the hibernation could be aware of the result and terminates the process
if md5 digest fails.

Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarChen Yu <yu.c.chen@intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent cc55f753

arch/x86/power/hibernate_64.c

+5 −6
Original line number Diff line number Diff line
@@ -265,9 +265,9 @@ static int get_e820_md5(struct e820_table *table, void *buf) 
	return ret;

}



static void hibernation_e820_save(void *buf)

static int hibernation_e820_save(void *buf)

{

	get_e820_md5(e820_table_firmware, buf);

	return get_e820_md5(e820_table_firmware, buf);

}



static bool hibernation_e820_mismatch(void *buf)
@@ -287,8 +287,9 @@ static bool hibernation_e820_mismatch(void *buf) 
	return memcmp(result, buf, MD5_DIGEST_SIZE) ? true : false;

}

#else

static void hibernation_e820_save(void *buf)

static int hibernation_e820_save(void *buf)

{

	return 0;

}



static bool hibernation_e820_mismatch(void *buf)
@@ -333,9 +334,7 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size) 


	rdr->magic = RESTORE_MAGIC;



	hibernation_e820_save(rdr->e820_digest);



	return 0;

	return hibernation_e820_save(rdr->e820_digest);

}



/**