[PATCH 08/18] crypto: caam - remove unreachable code in report_ccb_status()

Marcin Niestroj m.niestroj at grinn-global.com
Mon Sep 3 04:23:58 PDT 2018


Pick commit 9305dff7ab8b5e1aef2c4c5c733ce7e1dc345433 from Linux
upstream.

    crypto: caam - remove unreachable code in report_ccb_status()

    ERRID is a 4-bit field.
    Since err_id values are in [0..15] and err_id_list array size is 16,
    the condition "err_id < ARRAY_SIZE(err_id_list)" is always true.

    Signed-off-by: Horia Geantă <horia.geanta at nxp.com>
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

Signed-off-by: Marcin Niestroj <m.niestroj at grinn-global.com>
---
 drivers/crypto/caam/error.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c
index 9c875375d..766875b58 100644
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
@@ -150,10 +150,9 @@ static void report_ccb_status(struct device_d *jrdev, const u32 status,
 	    strlen(rng_err_id_list[err_id])) {
 		/* RNG-only error */
 		err_str = rng_err_id_list[err_id];
-	} else if (err_id < ARRAY_SIZE(err_id_list))
+	} else {
 		err_str = err_id_list[err_id];
-	else
-		snprintf(err_err_code, sizeof(err_err_code), "%02x", err_id);
+	}
 
 	/*
 	 * CCB ICV check failures are part of normal operation life;
-- 
2.18.0




More information about the barebox mailing list