3.16.39-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Tyrel Datwyler <[email protected]> commit a87eeb900dbb9f8202f96604d56e47e67c936b9d upstream. Commit 655ee63cf371 ("scsi constants: command, sense key + additional sense string") added a "Completed" sense string with key 0xF to snstext[], but failed to updated the upper bounds check of the sense key in scsi_sense_key_string(). Fixes: 655ee63cf371 ("[SCSI] scsi constants: command, sense key + additional sense strings") Signed-off-by: Tyrel Datwyler <[email protected]> Reviewed-by: Bart Van Assche <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings <[email protected]> --- drivers/scsi/constants.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c @@ -1335,9 +1335,10 @@ static const char * const snstext[] = { /* Get sense key string or NULL if not available */ const char * -scsi_sense_key_string(unsigned char key) { +scsi_sense_key_string(unsigned char key) +{ #ifdef CONFIG_SCSI_CONSTANTS - if (key <= 0xE) + if (key < ARRAY_SIZE(snstext)) return snstext[key]; #endif return NULL;
