On 09/26/2011 01:23 AM, Dan Carpenter wrote:
> "sense_len" was declared as int type but actually it only stores a
> u16 value that comes from hardware. The cast to u16 in min_t()
> confuses static analysis because it truncates the int to u16 so I've
> fixed the declaration to reflect that "sense_len" is just a u16.
>
> Also there was a call to cpu_to_be16() which I've changed to
> be16_to_cpu(). The functions are equivalent, but obviously the
> hardware is big endian and we're doing the min_t() comparison on CPU
> endian values.
>
> This whole patch is just a cleanup and doesn't affect how the code
> works.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> ---
> Compile tested only. Sorry.
>
> diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
> index 57fea38..344af8d 100644
> --- a/drivers/scsi/be2iscsi/be_main.c
> +++ b/drivers/scsi/be2iscsi/be_main.c
> @@ -1104,7 +1104,6 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn,
> struct be_status_bhs *sts_bhs =
> (struct be_status_bhs *)io_task->cmd_bhs;
> struct iscsi_conn *conn = beiscsi_conn->conn;
> - unsigned int sense_len;
> unsigned char *sense;
> u32 resid = 0, exp_cmdsn, max_cmdsn;
> u8 rsp, status, flags;
> @@ -1147,9 +1146,11 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn,
> }
>
> if (status == SAM_STAT_CHECK_CONDITION) {
> + u16 sense_len;
> unsigned short *slen = (unsigned short *)sts_bhs->sense_info;
> +
> sense = sts_bhs->sense_info + sizeof(unsigned short);
> - sense_len = cpu_to_be16(*slen);
> + sense_len = be16_to_cpu(*slen);
> memcpy(task->sc->sense_buffer, sense,
> min_t(u16, sense_len, SCSI_SENSE_BUFFERSIZE));
Looks ok to me.
Reviewed-by: Mike Christie <michaelc@xxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
