Patch "crypto: jitter - correct health test during initialization" has been added to the 6.4-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    crypto: jitter - correct health test during initialization

to the 6.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     crypto-jitter-correct-health-test-during-initializat.patch
and it can be found in the queue-6.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 9858904df1dee39ff0db1d7c8de30ee271b53a85
Author: Stephan Müller <smueller@xxxxxxxxxx>
Date:   Thu May 25 19:00:05 2023 +0200

    crypto: jitter - correct health test during initialization
    
    [ Upstream commit d23659769ad1bf2cbafaa0efcbae20ef1a74f77e ]
    
    With the update of the permanent and intermittent health errors, the
    actual indicator for the health test indicates a potential error only
    for the one offending time stamp gathered in the current iteration
    round. The next iteration round will "overwrite" the health test result.
    
    Thus, the entropy collection loop in jent_gen_entropy checks for
    the health test failure upon each loop iteration. However, the
    initialization operation checked for the APT health test once for
    an APT window which implies it would not catch most errors.
    
    Thus, the check for all health errors is now invoked unconditionally
    during each loop iteration for the startup test.
    
    With the change, the error JENT_ERCT becomes unused as all health
    errors are only reported with the JENT_HEALTH return code. This
    allows the removal of the error indicator.
    
    Fixes: 3fde2fe99aa6 ("crypto: jitter - permanent and intermittent health errors"
    )
    Reported-by: Joachim Vandersmissen <git@xxxxxxxxx>
    Signed-off-by: Stephan Mueller <smueller@xxxxxxxxxx>
    Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c
index 22f48bf4c6f57..227cedfa4f0ae 100644
--- a/crypto/jitterentropy.c
+++ b/crypto/jitterentropy.c
@@ -117,7 +117,6 @@ struct rand_data {
 				   * zero). */
 #define JENT_ESTUCK		8 /* Too many stuck results during init. */
 #define JENT_EHEALTH		9 /* Health test failed during initialization */
-#define JENT_ERCT		10 /* RCT failed during initialization */
 
 /*
  * The output n bits can receive more than n bits of min entropy, of course,
@@ -762,14 +761,12 @@ int jent_entropy_init(void)
 			if ((nonstuck % JENT_APT_WINDOW_SIZE) == 0) {
 				jent_apt_reset(&ec,
 					       delta & JENT_APT_WORD_MASK);
-				if (jent_health_failure(&ec))
-					return JENT_EHEALTH;
 			}
 		}
 
-		/* Validate RCT */
-		if (jent_rct_failure(&ec))
-			return JENT_ERCT;
+		/* Validate health test result */
+		if (jent_health_failure(&ec))
+			return JENT_EHEALTH;
 
 		/* test whether we have an increasing timer */
 		if (!(time2 > time))



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux