AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

crypto: caam - fix error reporting

Browse Source 
The error code returned by hardware is four bits wide with an expected
zero MSB. A hardware error condition where the error code can get between
0x8 and 0xf will trigger an out of bound array access on the error
message table.
This patch fixes the invalid array access following such an error and
reports the condition.

Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Cristian Stoica 2014-11-05 11:21:24 +02:00 committed by Herbert Xu
parent 7222d1a341
commit 49783d0f54
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/crypto/caam/error.c
View File

@ -213,27 +213,36 @@ void caam_jr_strstatus(struct device *jrdev, u32 status)
void (*report_ssed)(struct device *jrdev, const u32 status, void (*report_ssed)(struct device *jrdev, const u32 status,
const char *error); const char *error);
const char *error; const char *error;
} status_src[] = { } status_src[16] = {
{ NULL, "No error" }, { NULL, "No error" },
{ NULL, NULL }, { NULL, NULL },
{ report_ccb_status, "CCB" }, { report_ccb_status, "CCB" },
{ report_jump_status, "Jump" }, { report_jump_status, "Jump" },
{ report_deco_status, "DECO" }, { report_deco_status, "DECO" },
{ NULL, NULL }, { NULL, "Queue Manager Interface" },
{ report_jr_status, "Job Ring" }, { report_jr_status, "Job Ring" },
{ report_cond_code_status, "Condition Code" }, { report_cond_code_status, "Condition Code" },
{ NULL, NULL },
{ NULL, NULL },
{ NULL, NULL },
{ NULL, NULL },
{ NULL, NULL },
{ NULL, NULL },
{ NULL, NULL },
{ NULL, NULL },
}; };
u32 ssrc = status >> JRSTA_SSRC_SHIFT; u32 ssrc = status >> JRSTA_SSRC_SHIFT;
const char *error = status_src[ssrc].error; const char *error = status_src[ssrc].error;
/* /*
* If there is no further error handling function, just * If there is an error handling function, call it to report the error.
* print the error code, error string and exit. Otherwise * Otherwise print the error source name.
* call the handler function.
*/ */
if (!status_src[ssrc].report_ssed) if (status_src[ssrc].report_ssed)
dev_err(jrdev, "%08x: %s: \n", status, status_src[ssrc].error);
else
status_src[ssrc].report_ssed(jrdev, status, error); status_src[ssrc].report_ssed(jrdev, status, error);
else if (error)
dev_err(jrdev, "%d: %s\n", ssrc, error);
else
dev_err(jrdev, "%d: unknown error source\n", ssrc);
} }
EXPORT_SYMBOL(caam_jr_strstatus); EXPORT_SYMBOL(caam_jr_strstatus);