Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756033AbbGPO2t (ORCPT ); Thu, 16 Jul 2015 10:28:49 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:36845 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755887AbbGPO1Q (ORCPT ); Thu, 16 Jul 2015 10:27:16 -0400 From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: linux-kernel@vger.kernel.org Cc: linux-efi@vger.kernel.org, linux-pm@vger.kernel.org, "Rafael J. Wysocki" , Matthew Garrett , Len Brown , Pavel Machek , Josh Boyer , Vojtech Pavlik , Matt Fleming , Jiri Kosina , "H. Peter Anvin" , "Lee, Chun-Yi" Subject: [RFC PATCH 11/16] PM / hibernate: Avoid including swsusp key to hibernate image Date: Thu, 16 Jul 2015 22:25:25 +0800 Message-Id: <1437056730-15247-12-git-send-email-jlee@suse.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1437056730-15247-1-git-send-email-jlee@suse.com> References: <1437056730-15247-1-git-send-email-jlee@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2590 Lines: 83 The HMAC key should only resides in kernel memory space but not leak to outside. To avoid including swsusp key in hibernate snapshot image, this patch adds the checking block in the code for asking saveable pages to make sure the key page should not marked as saveable. Signed-off-by: Lee, Chun-Yi --- arch/x86/power/hibernate_keys.c | 14 ++++++++++++++ kernel/power/power.h | 3 +++ kernel/power/snapshot.c | 6 ++++++ 3 files changed, 23 insertions(+) diff --git a/arch/x86/power/hibernate_keys.c b/arch/x86/power/hibernate_keys.c index 4a68b86..775c6d8 100644 --- a/arch/x86/power/hibernate_keys.c +++ b/arch/x86/power/hibernate_keys.c @@ -48,6 +48,20 @@ int get_swsusp_key(u8 **skey) return swsusp_keys->skey_status; } +bool swsusp_page_is_keys(struct page *page) +{ + bool ret = false; + + if (!swsusp_keys || swsusp_keys->skey_status) + return ret; + + ret = (page_to_pfn(page) == page_to_pfn(virt_to_page(swsusp_keys))); + if (ret) + pr_info("PM: Avoid snapshot the page of swsusp key.\n"); + + return ret; +} + static int __init init_hibernate_keys(void) { struct swsusp_keys *keys; diff --git a/kernel/power/power.h b/kernel/power/power.h index 25c541e..a09b21d 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -19,6 +19,9 @@ struct swsusp_info { #ifdef CONFIG_HIBERNATE_VERIFICATION /* arch/x86/power/hibernate_keys.c */ extern int get_swsusp_key(u8 **skey); +extern bool swsusp_page_is_keys(struct page *page); +#else +static inline bool swsusp_page_is_keys(struct page *page) { return false; } #endif /* kernel/power/snapshot.c */ diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index af60731..c2bce90 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1093,6 +1093,9 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn) BUG_ON(!PageHighMem(page)); + if (swsusp_page_is_keys(page)) + return NULL; + if (swsusp_page_is_forbidden(page) || swsusp_page_is_free(page) || PageReserved(page)) return NULL; @@ -1155,6 +1158,9 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn) BUG_ON(PageHighMem(page)); + if (swsusp_page_is_keys(page)) + return NULL; + if (swsusp_page_is_forbidden(page) || swsusp_page_is_free(page)) return NULL; -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/