On Wed, Sep 19, 2018 at 9:31 AM Chen Yu <yu.c.c...@intel.com> wrote:
>
> 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: Thomas Gleixner <t...@linutronix.de>
> Cc: "Rafael J. Wysocki" <r...@rjwysocki.net>
> Signed-off-by: Chen Yu <yu.c.c...@intel.com>
> ---
> arch/x86/power/hibernate_64.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
> index f8e3b668d20b..e0de959ad02d 100644
> --- a/arch/x86/power/hibernate_64.c
> +++ b/arch/x86/power/hibernate_64.c
> @@ -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);
> }
>
> /**
> --
Reviewed-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
