Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp930800pxf; Thu, 8 Apr 2021 16:56:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRxm9HrGW+wk7SsGsv3Qo+8nlbL55H/Di3CSMV3nUy4SXIA0xod9ExargOnCgf6U5SA80s X-Received: by 2002:a17:906:a40b:: with SMTP id l11mr8574304ejz.473.1617926171662; Thu, 08 Apr 2021 16:56:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617926171; cv=none; d=google.com; s=arc-20160816; b=MVfKn6cSJ5U7TRlFMhNc/9oFjc3nY3lzjGiWa2FeLdG9htShy4FOHv+B14dYcSp60r rDtpL8SO83ZubE5E6QUqtB2q0IR41W74tUyl/h+x0F3LHlr3OHqOZPCcS8pN5ZmrAJ28 0V2J7KJ73CceJLg0xsmQAYst+beYcCkn7RDDaXYV7davBY3TmBCAG88WDdiTTn81YZMg cnWfFMZtdvd7wuXJp3fTQA9XOvECXD11DzorhBYwmvly9En4uh1oZfkbI9O5KsndZxTY CMBSyc6xR1eTfQMCMla9wL6RFHU2tYpqsW7UeRtgVtke/NYW0QQtBZxuvCcA5gYy8NwJ 6tJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=0z9Js1r7OKJplksFaK5SQdpm2EuYrJisddLKiWu0xiw=; b=vs91CT0sjsOPunjKfixQsVyXQVvE9kq1Wd+Zieg+CQTRn9eHGHbB9RKD23HBVNyv2v JGsWYzXVA2yCACGsrp5gnKxsSUWQMQy3s7Wj+0tJ0puax8lnpQZWsTrNkhdl9P0qG41v Htksx5RddInftMuGDIh0cV1e84v1GjwaFPczhsUtGczZS05fth/4ucJApuElCHycB+JU g6bBdXE+o06H9cNapcVb4Ja+jCuglqRsJeAZBLG1tt++vdr9IlNDLXBtXE4gEYB+yLTq kGK6JjHtv2fxV8K900BMLeXLGe5qcSLGXarJfGvex9+l3rk1AIdkXjIA8CwUZv+FTetz 0LBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AiXVaVzf; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z19si945534edx.219.2021.04.08.16.55.39; Thu, 08 Apr 2021 16:56:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AiXVaVzf; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233018AbhDHXzm (ORCPT + 99 others); Thu, 8 Apr 2021 19:55:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:37036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233009AbhDHXzm (ORCPT ); Thu, 8 Apr 2021 19:55:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1018861151; Thu, 8 Apr 2021 23:55:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617926130; bh=SUv1EmiHLV/4OjfzTusbiqGWcCkMUz2DyvyUUnJ+SZ4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=AiXVaVzfdo5Rr24r5RglJ24YvxSbVdSR9sUJMKrZNgIS5DA9xS7v9lUeDGp6SeG1P y4SWJnCy2xrKfe8M0sEyjIAgPZePczJVNorjOkijUz9h9FahY7iwPtcq5y8EWiJFlX DxHh/zmIhOd/GEfvrvvrfBu826zfgbBVRQAnlYDNZQD4M8zsGmJg00LKQiUyTWpahR q8oqYve83TKwtCYjHXIqxOJ2/VZFW2vswrEF3aSYC/nQLCCkLuw943eo28Bpp0BbuN zAy/6ORAIDY1L8DctfUMkLWcIa8AX7RtusWbAMPl0pXlIAb10NS/UnIbFbwY6E7fsQ 2aX2RrxjLEToA== Date: Thu, 8 Apr 2021 16:55:28 -0700 From: Eric Biggers To: Chris von Recklinghausen Cc: ardb@kernel.org, simo@redhat.com, rafael@kernel.org, decui@microsoft.com, linux-pm@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 1/1] use crc32 instead of md5 for hibernation e820 integrity check Message-ID: References: <20210408131506.17941-1-crecklin@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On Thu, Apr 08, 2021 at 11:53:59AM -0400, Chris von Recklinghausen wrote: > On 4/8/21 11:30 AM, Eric Biggers wrote: > > On Thu, Apr 08, 2021 at 09:15:06AM -0400, Chris von Recklinghausen wrote: > > > Suspend fails on a system in fips mode because md5 is used for the e820 > > > integrity check and is not available. Use crc32 instead. > > > > > > This patch changes the integrity check algorithm from md5 to > > > crc32. This integrity check is used only to verify accidental > > > corruption of the hybernation data and is not intended as a > > > cryptographic integrity check. > > > Md5 is overkill in this case and also disabled in FIPS mode because it > > > is known to be broken for cryptographic purposes. > > > > > > Fixes: 62a03defeabd ("PM / hibernate: Verify the consistent of e820 memory map > > > by md5 digest") > > > > > > Tested-by: Dexuan Cui > > > Reviewed-by: Dexuan Cui > > > Signed-off-by: Chris von Recklinghausen > > > --- > > > v1 -> v2 > > > bump up RESTORE_MAGIC > > > v2 -> v3 > > > move embelishment from cover letter to commit comments (no code change) > > > v3 -> v4 > > > add note to comments that md5 isn't used for encryption here. > > > v4 -> v5 > > > reword comment per Simo's suggestion > > > > > > arch/x86/power/hibernate.c | 35 +++++++++++++++++++---------------- > > > 1 file changed, 19 insertions(+), 16 deletions(-) > > > > > > diff --git a/arch/x86/power/hibernate.c b/arch/x86/power/hibernate.c > > > index cd3914fc9f3d..b56172553275 100644 > > > --- a/arch/x86/power/hibernate.c > > > +++ b/arch/x86/power/hibernate.c > > > @@ -55,31 +55,31 @@ int pfn_is_nosave(unsigned long pfn) > > > } > > > -#define MD5_DIGEST_SIZE 16 > > > +#define CRC32_DIGEST_SIZE 16 > > > struct restore_data_record { > > > unsigned long jump_address; > > > unsigned long jump_address_phys; > > > unsigned long cr3; > > > unsigned long magic; > > > - u8 e820_digest[MD5_DIGEST_SIZE]; > > > + u8 e820_digest[CRC32_DIGEST_SIZE]; > > > }; > > > -#if IS_BUILTIN(CONFIG_CRYPTO_MD5) > > > +#if IS_BUILTIN(CONFIG_CRYPTO_CRC32) > > Should CONFIG_CRYPTO_CRC32 be getting selected from somewhere? > > > Yes, presumably from the same source that sets CONFIG_CRYPTO_MD5. Also > presumably there's value to not forcing the check if the config value is not > set. I wouldn't be so sure about that. It might just be a bug that CONFIG_CRYPTO_MD5 wasn't being selected. Where is it documented that the user needed to set CONFIG_CRYPTO_MD5=y if they wanted the hibernation image checksumming to work? > > > > If that is too hard because it would pull in too much of the crypto API, maybe > > using the library interface to CRC-32 (lib/crc32.c) would be a better fit? > > > Based on my statement above, the intent is to provide a simple drop in > replacement for md5 so that users of FIPS mode can suspend/resume without > any errors. > It's possible that most people have CONFIG_CRYPTO_MD5 enabled for some unrelated reason so the hibernation image checksumming works by chance. CONFIG_CRYPTO_CRC32 is a different option so the same is not necessarily true. However, note that CONFIG_HIBERNATION already selects CONFIG_CRC32 (the library interface to CRC-32) but not CONFIG_CRYPTO_CRC32 (shash interface to CRC-32). So, if this code just used the library interface crc32_le(), it will always be available and the IS_BUILTIN() checks can be removed... - Eric