From patchwork Tue Aug 11 06:16:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 6989001 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 01FE59F358 for ; Tue, 11 Aug 2015 06:23:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A15920605 for ; Tue, 11 Aug 2015 06:23:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DD77205D1 for ; Tue, 11 Aug 2015 06:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933969AbbHKGRg (ORCPT ); Tue, 11 Aug 2015 02:17:36 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:35001 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933700AbbHKGR3 (ORCPT ); Tue, 11 Aug 2015 02:17:29 -0400 Received: by pacgr6 with SMTP id gr6so43527544pac.2; Mon, 10 Aug 2015 23:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1l64AxIYf+h3hCZrjVa6rsru/ZSKqRbxg7wSFafOFf4=; b=qcIW8M3n54P47Z+GeF0gJLdc0H8XAT/T1ZXP3IQ70Mip/0xorkWqvFXBViRT4j9Gyy ACu9UdGqMr9ArCCEuLVKS6i2SNYVR1ZnSmOqNPvaPAYWSrnE6Oth7TH6lPcszHoQ0N4q XwelvXq66qxKW2v9xUhQ9sUv9t8OjvIw7uN0QSVXaVkNtW2t9A0k2NvSiAXInNCoo+s7 +A63lWV9uRX+bp1vmcQQnQTu8nbLhmxvkqr74p/q7/mUCrUFGZefMmbeLrtJgX4ZjTnn t3kMmFdMHX0EJJuXnKxpFgW0R221XWpr4DxG6bHzgzSfuAUKq41riZmAAQVonk59iLmI 3ejg== X-Received: by 10.66.255.67 with SMTP id ao3mr52824291pad.60.1439273848953; Mon, 10 Aug 2015 23:17:28 -0700 (PDT) Received: from linux-rxt1.site ([130.57.30.250]) by smtp.gmail.com with ESMTPSA id qe3sm1082667pbc.73.2015.08.10.23.17.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Aug 2015 23:17:28 -0700 (PDT) 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" , Ingo Molnar , "Lee, Chun-Yi" Subject: [PATCH v2 01/16] PM / hibernate: define HMAC algorithm and digest size of hibernation Date: Tue, 11 Aug 2015 14:16:21 +0800 Message-Id: <1439273796-25359-2-git-send-email-jlee@suse.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1439273796-25359-1-git-send-email-jlee@suse.com> References: <1439273796-25359-1-git-send-email-jlee@suse.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Using HMAC-SHA1 to be the HMAC algorithm of signing hibernate snapshot image. The digest size of HMAC-SHA1 is 160 bits (20 bytes), this size will be also applied to the length of HMAC key. In addition, moved swsusp_info struct definition into CONFIG_HIBERNATION ifdef block because only hibernate code uses it. Add HIBERNATE_VERIFICATION kernel config for using by later hibernate signature verification code. Signed-off-by: Lee, Chun-Yi --- include/linux/suspend.h | 5 +++++ kernel/power/Kconfig | 13 +++++++++++++ kernel/power/power.h | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 5efe743..56c6de9 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -327,6 +327,11 @@ struct platform_hibernation_ops { }; #ifdef CONFIG_HIBERNATION + +/* HMAC Algorithm of Hibernate Signature */ +#define HIBERNATION_HMAC "hmac(sha1)" +#define HIBERNATION_DIGEST_SIZE 20 + /* kernel/power/snapshot.c */ extern void __register_nosave_region(unsigned long b, unsigned long e, int km); static inline void __init register_nosave_region(unsigned long b, unsigned long e) diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 9e30231..8608b3b 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -66,6 +66,19 @@ config HIBERNATION For more information take a look at . +config HIBERNATE_VERIFICATION + bool "Hibernate verification" + depends on HIBERNATION + depends on EFI_STUB + depends on X86 + select CRYPTO_HMAC + select CRYPTO_SHA1 + help + This option provides support for generating and verifying the + signature of memory snapshot image by HMAC-SHA1. Current mechanism + relies on UEFI secure boot environment, EFI stub generates HMAC + key for hibernate verification. + config ARCH_SAVE_PAGE_KEYS bool diff --git a/kernel/power/power.h b/kernel/power/power.h index caadb56..6ea5c78 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -4,6 +4,7 @@ #include #include +#ifdef CONFIG_HIBERNATION struct swsusp_info { struct new_utsname uts; u32 version_code; @@ -12,9 +13,9 @@ struct swsusp_info { unsigned long image_pages; unsigned long pages; unsigned long size; + u8 signature[HIBERNATION_DIGEST_SIZE]; } __aligned(PAGE_SIZE); -#ifdef CONFIG_HIBERNATION /* kernel/power/snapshot.c */ extern void __init hibernate_reserved_size_init(void); extern void __init hibernate_image_size_init(void);