All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chen Yu <yu.c.chen@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
	"Rafael J. Wysocki" <rafael@kernel.org>
Cc: Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
	Zhimin Gu <kookoo.gu@intel.com>, Chen Yu <yu.c.chen@intel.com>,
	x86@kernel.org, linux-pm@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 02/12][v4] PM / hibernate: Check the success of generating md5 digest before hibernation
Date: Fri, 21 Sep 2018 14:26:38 +0800	[thread overview]
Message-ID: <a4fb21d16b59b1d32fec9bf67e1f6fa38d1f061d.1537448058.git.yu.c.chen@intel.com> (raw)
In-Reply-To: <cover.1537448058.git.yu.c.chen@intel.com>

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 <tglx@linutronix.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@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);
 }
 
 /**
-- 
2.17.1


  parent reply	other threads:[~2018-09-21  6:19 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-21  6:24 [PATCH 00/12][v4] Backport several fixes from 64bits to 32bits hibernation Chen Yu
2018-09-21  6:26 ` [PATCH 01/12][v4] x86, hibernate: Fix nosave_regions setup for hibernation Chen Yu
2018-09-21  6:26 ` Chen Yu [this message]
2018-09-21  6:26 ` [PATCH 03/12][v4] x86-32/asm/power: Create stack frames in hibernate_asm_32.S Chen Yu
2018-09-21  6:26 ` [PATCH 04/12][v4] x86, hibernate: Extract the common code of 64/32 bit system Chen Yu
2018-09-21  6:27 ` [PATCH 05/12][v4] x86-32, hibernate: Enable CONFIG_ARCH_HIBERNATION_HEADER on 32bit system Chen Yu
2018-09-21  6:27 ` [PATCH 06/12][v4] x86, hibernate: Rename temp_level4_pgt to temp_pgt Chen Yu
2018-09-21  6:27 ` [PATCH 07/12][v4] x86-32, hibernate: Use temp_pgt as the temporary page table Chen Yu
2018-09-21 11:21   ` Pavel Machek
2018-09-21  6:28 ` [PATCH 08/12][v4] x86-32, hibernate: Use the page size macro instead of constant value Chen Yu
2018-09-21  6:28 ` [PATCH 09/12][v4] x86-32, hibernate: Switch to original page table after resumed Chen Yu
2018-09-21  6:28 ` [PATCH 10/12][v4] x86-32, hibernate: Switch to relocated restore code during resume on 32bit system Chen Yu
2018-09-21  6:28 ` [PATCH 11/12][v4] x86-32, hibernate: Set up temporary text mapping for " Chen Yu
2018-09-21  6:28 ` [PATCH 12/12][v4] x86-32, hibernate: Adjust in_suspend after resumed on " Chen Yu
2018-10-02  9:20 ` [PATCH 00/12][v4] Backport several fixes from 64bits to 32bits hibernation Thomas Gleixner
2018-10-05  9:49   ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a4fb21d16b59b1d32fec9bf67e1f6fa38d1f061d.1537448058.git.yu.c.chen@intel.com \
    --to=yu.c.chen@intel.com \
    --cc=kookoo.gu@intel.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=rafael@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.