[PATCH] scsi: fix upper bounds check of sense key in scsi_sense_key_string()

[PATCH] scsi: fix upper bounds check of sense key in scsi_sense_key_string()

[Tyrel Datwyler]

Commit 655ee63cf371 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 <tyreld@linux.vnet.ibm.com>
---
 drivers/scsi/constants.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 83458f7..70d8dc4 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -362,7 +362,7 @@ static const char * const snstext[] = {
 /* Get sense key string or NULL if not available */
 const char *
 scsi_sense_key_string(unsigned char key) {
-	if (key <= 0xE)
+	if (key <= 0xF)
 		return snstext[key];
 	return NULL;
 }
-- 
2.7.4

Re: [PATCH] scsi: fix upper bounds check of sense key in scsi_sense_key_string()

[Bart Van Assche]

On 08/04/2016 02:32 PM, Tyrel Datwyler wrote:
> Commit 655ee63cf371 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 <tyreld@linux.vnet.ibm.com>
> ---
>  drivers/scsi/constants.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index 83458f7..70d8dc4 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -362,7 +362,7 @@ static const char * const snstext[] = {
>  /* Get sense key string or NULL if not available */
>  const char *
>  scsi_sense_key_string(unsigned char key) {
> -	if (key <= 0xE)
> +	if (key <= 0xF)
>  		return snstext[key];
>  	return NULL;
>  }

Hello Tyrel,

Please move the opening brace ("{") to a line of its own.

If you change "<= 0xF" into "< ARRAY_SIZE(snstext)" then you are welcome 
to add:

Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>

Thanks,

Bart.

Re: [PATCH] scsi: fix upper bounds check of sense key in scsi_sense_key_string()

[Tyrel Datwyler]

On 08/09/2016 01:08 PM, Bart Van Assche wrote:
> On 08/04/2016 02:32 PM, Tyrel Datwyler wrote:
>> Commit 655ee63cf371 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 <tyreld@linux.vnet.ibm.com>
>> ---
>>  drivers/scsi/constants.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>> index 83458f7..70d8dc4 100644
>> --- a/drivers/scsi/constants.c
>> +++ b/drivers/scsi/constants.c
>> @@ -362,7 +362,7 @@ static const char * const snstext[] = {
>>  /* Get sense key string or NULL if not available */
>>  const char *
>>  scsi_sense_key_string(unsigned char key) {
>> -	if (key <= 0xE)
>> +	if (key <= 0xF)
>>  		return snstext[key];
>>  	return NULL;
>>  }
> 
> Hello Tyrel,
> 
> Please move the opening brace ("{") to a line of its own.
> 
> If you change "<= 0xF" into "< ARRAY_SIZE(snstext)" then you are welcome

This actually occurred to me as a better long term solution after I had
already posted the patch.

> to add:
> 
> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>

Thanks for your comments. I'll address and spin a version 2.

-Tyrel

> 
> Thanks,
> 
> Bart.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>