Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1748961ybp; Wed, 9 Oct 2019 19:53:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcNeVVysaeNDjVtYvZshL5ASoGfQ3IIzYzg4uSxlrfXyvstd9o5tPbgTBERbY/a/I9zl1R X-Received: by 2002:aa7:c2d7:: with SMTP id m23mr6002923edp.206.1570676016464; Wed, 09 Oct 2019 19:53:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570676016; cv=none; d=google.com; s=arc-20160816; b=umqveMz3rp0xsQPMcT+KrY1r78/DtauxMQ/ADAVhbmF2TNRqoZJKtGnFG/1r0zYZCb wzl9ZgVy6nc/6kzbEoYUo4EDgGVj8Px7Z2lJdQ5T2KRDV9uQdB6Y7+U5/8wVHg1XZ9fU +7f+y56EF+R1rfTyEd4/ZeRtuMsRQqg0Hf0zUnptQAysFdna1CtzMxskYotBZpMFmSr3 42qeW+IkrRSdTzoDcZcdxKtite3tVV9ehdWiA6wFks/0sKXx9JHGuNBf1+/wOQY+jAWW SN1S5LO1zz/vxsmmxOV7xlpmc+VvOzcEdtUTwmFcb1qBvO80/mJIEwOlzAOpaP+swa+g g1Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=DCqsDX7AFK/owu9c6mYwWq4Ozrap+AjkIa6KYz4kZSA=; b=e5nb4U1TSw6617hvlJbNCi+2s80ngznzTmJo3SJdFrBr2edj+Ixi6NDkQTEz6OY48b 02VLrQDbaiuNyOxDcHYsIkj5joaX1yz8qj6uME94E9hT1c1+NI4iFunrro9XqkMrh8zh 8RY/L7PFgrcUJfNaLzoeIYFvdnzksrDosO3VsKHlt19vqJbeoKOa3CB7JM7J4sEd+LWA 0kNbtGbMD3J0jUSFfeiPFYjSFElXdIQdFIA7BdJHXfVYTUfEFtFdYoYmTdZYyGso+UCe onsRbIXPeg1gGB6z+JMs1yIjtm3yUqaPNln79t5Oq4W67TVixC1qfgJFRbjgNzcX8PPg 6ktg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k16si2337054ejc.134.2019.10.09.19.53.04; Wed, 09 Oct 2019 19:53:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732546AbfJJCwk (ORCPT + 99 others); Wed, 9 Oct 2019 22:52:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39694 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731589AbfJJCwk (ORCPT ); Wed, 9 Oct 2019 22:52:40 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 401BE30860D6; Thu, 10 Oct 2019 02:52:39 +0000 (UTC) Received: from dhcp-128-65.nay.redhat.com (ovpn-12-56.pek2.redhat.com [10.72.12.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54D1260923; Thu, 10 Oct 2019 02:52:33 +0000 (UTC) Date: Thu, 10 Oct 2019 10:52:29 +0800 From: Dave Young To: Arvind Sankar Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Hans de Goede , linux-crypto@vger.kernel.org, linux-s390@vger.kernel.org, x86@kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Herbert Xu , Ard Biesheuvel , Stephan Mueller , kexec@lists.infradead.org Subject: Re: [PATCH] lib/string: make memzero_explicit inline instead of external Message-ID: <20191010025229.GA3376@dhcp-128-65.nay.redhat.com> References: <1d17349e-98ab-b582-6981-b484b0e970b6@redhat.com> <20191007220000.GA408752@rani.riverdale.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191007220000.GA408752@rani.riverdale.lan> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 10 Oct 2019 02:52:40 +0000 (UTC) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On 10/07/19 at 06:00pm, Arvind Sankar wrote: > With the use of the barrier implied by barrier_data(), there is no need > for memzero_explicit to be extern. Making it inline saves the overhead > of a function call, and allows the code to be reused in arch/*/purgatory > without having to duplicate the implementation. > > Fixes: 906a4bb97f5d ("crypto: sha256 - Use get/put_unaligned_be32 to get input, memzero_explicit") > Reviewed-by: Hans de Goede > Tested-by: Hans de Goede > Signed-off-by: Arvind Sankar > --- > include/linux/string.h | 21 ++++++++++++++++++++- > lib/string.c | 21 --------------------- > 2 files changed, 20 insertions(+), 22 deletions(-) > > diff --git a/include/linux/string.h b/include/linux/string.h > index b2f9df7f0761..b6ccdc2c7f02 100644 > --- a/include/linux/string.h > +++ b/include/linux/string.h > @@ -227,7 +227,26 @@ static inline bool strstarts(const char *str, const char *prefix) > } > > size_t memweight(const void *ptr, size_t bytes); > -void memzero_explicit(void *s, size_t count); > + > +/** > + * memzero_explicit - Fill a region of memory (e.g. sensitive > + * keying data) with 0s. > + * @s: Pointer to the start of the area. > + * @count: The size of the area. > + * > + * Note: usually using memset() is just fine (!), but in cases > + * where clearing out _local_ data at the end of a scope is > + * necessary, memzero_explicit() should be used instead in > + * order to prevent the compiler from optimising away zeroing. > + * > + * memzero_explicit() doesn't need an arch-specific version as > + * it just invokes the one of memset() implicitly. > + */ > +static inline void memzero_explicit(void *s, size_t count) > +{ > + memset(s, 0, count); > + barrier_data(s); > +} > > /** > * kbasename - return the last part of a pathname. > diff --git a/lib/string.c b/lib/string.c > index cd7a10c19210..08ec58cc673b 100644 > --- a/lib/string.c > +++ b/lib/string.c > @@ -748,27 +748,6 @@ void *memset(void *s, int c, size_t count) > EXPORT_SYMBOL(memset); > #endif > > -/** > - * memzero_explicit - Fill a region of memory (e.g. sensitive > - * keying data) with 0s. > - * @s: Pointer to the start of the area. > - * @count: The size of the area. > - * > - * Note: usually using memset() is just fine (!), but in cases > - * where clearing out _local_ data at the end of a scope is > - * necessary, memzero_explicit() should be used instead in > - * order to prevent the compiler from optimising away zeroing. > - * > - * memzero_explicit() doesn't need an arch-specific version as > - * it just invokes the one of memset() implicitly. > - */ > -void memzero_explicit(void *s, size_t count) > -{ > - memset(s, 0, count); > - barrier_data(s); > -} > -EXPORT_SYMBOL(memzero_explicit); > - > #ifndef __HAVE_ARCH_MEMSET16 > /** > * memset16() - Fill a memory area with a uint16_t > -- Thanks for the fix! Ccing kexec list since the problem is kexec/kdump related. People can try it when they see same issue. Dave