linux-kernel - RE: hwrng: cctrng - Remove unnecessary FIPS ifdef

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <DB6PR0802MB2533B88B20AC4BDEF5955818E9D40@DB6PR0802MB2533.eurprd08.prod.outlook.com>
Date:   Mon, 20 Apr 2020 08:36:01 +0000
From:   Hadar Gat <Hadar.Gat@....com>
To:     Herbert Xu <herbert@...dor.apana.org.au>
CC:     Matt Mackall <mpm@...enic.com>, Arnd Bergmann <arnd@...db.de>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Gilad Ben-Yossef <gilad@...yossef.com>,
        Ofir Drang <Ofir.Drang@....com>,
        "linux-crypto@...r.kernel.org" <linux-crypto@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        nd <nd@....com>
Subject: RE: hwrng: cctrng - Remove unnecessary FIPS ifdef


> -----Original Message-----
> From: Herbert Xu <herbert@...dor.apana.org.au>
> Sent: Monday, 20 April 2020 11:28
> To: Hadar Gat <Hadar.Gat@....com>
> Cc: Matt Mackall <mpm@...enic.com>; Arnd Bergmann <arnd@...db.de>;
> Greg Kroah-Hartman <gregkh@...uxfoundation.org>; Gilad Ben-Yossef
> <gilad@...yossef.com>; Ofir Drang <Ofir.Drang@....com>; linux-
> crypto@...r.kernel.org; linux-kernel@...r.kernel.org
> Subject: hwrng: cctrng - Remove unnecessary FIPS ifdef
> 
> This patch removes the unnecessary FIPS ifdef in cctrng.
> 
> Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au>
> 

Acked-by: Hadar Gat <hadar.gat@....com>


> diff --git a/drivers/char/hw_random/cctrng.c
> b/drivers/char/hw_random/cctrng.c index e82716c12c3a..49fb65a221f3
> 100644
> --- a/drivers/char/hw_random/cctrng.c
> +++ b/drivers/char/hw_random/cctrng.c
> @@ -331,13 +331,11 @@ void cc_trng_compwork_handler(struct
> work_struct *w)
>  	ehr_valid = CC_REG_FLD_GET(RNG_ISR, EHR_VALID, isr);
>  	dev_dbg(dev, "Got RNG_ISR=0x%08X (EHR_VALID=%u)\n", isr,
> ehr_valid);
> 
> -#ifdef CONFIG_CRYPTO_FIPS
> -	if (CC_REG_FLD_GET(RNG_ISR, CRNGT_ERR, isr) && fips_enabled) {
> +	if (fips_enabled && CC_REG_FLD_GET(RNG_ISR, CRNGT_ERR, isr)) {
>  		fips_fail_notify();
>  		/* FIPS error is fatal */
>  		panic("Got HW CRNGT error while fips is enabled!\n");
>  	}
> -#endif
> 
>  	/* Clear all pending RNG interrupts */
>  	cc_iowrite(drvdata, CC_RNG_ICR_REG_OFFSET, isr);
> --
> Email: Herbert Xu <herbert@...dor.apana.org.au> Home Page:
> http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt