On 11/08/2009 02:29 PM, Boaz Harrosh wrote:
>
> The (never tested) osd_sense_attribute_identification case
> has never worked. The loop was never advanced on.
> Fix it to work as intended.
>
> On 10/30/2009 04:39 PM, Roel Kluin wrote:
> I found this by code analysis, searching for while
> loops that test a local variable, but do not modify
> the variable.
>
> Reported-by: Roel Kluin <roel.kluin@xxxxxxxxx>
> Signed-off-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
> ---
> drivers/scsi/osd/osd_initiator.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
> index 60b7ca1..d504e82 100644
> --- a/drivers/scsi/osd/osd_initiator.c
> +++ b/drivers/scsi/osd/osd_initiator.c
> @@ -1584,14 +1584,13 @@ int osd_req_decode_sense_full(struct osd_request *or,
> struct osd_sense_attributes_data_descriptor
> *osadd = cur_descriptor;
> int len = min(cur_len, sense_len);
len should be unsigned for the compare with sizeof() below.
I'll repost a second version as reply.
Boaz
> - int i = 0;
> struct osd_sense_attr *pattr = osadd->sense_attrs;
>
> - while (len < 0) {
> + while (len >= sizeof(*pattr)) {
> u32 attr_page = be32_to_cpu(pattr->attr_page);
> u32 attr_id = be32_to_cpu(pattr->attr_id);
>
> - if (i++ == 0) {
> + if (!osi->attr.attr_page) {
> osi->attr.attr_page = attr_page;
> osi->attr.attr_id = attr_id;
> }
> @@ -1602,6 +1601,8 @@ int osd_req_decode_sense_full(struct osd_request *or,
> bad_attr_list++;
> max_attr--;
> }
> +
> + len -= sizeof(*pattr);
> OSD_SENSE_PRINT2(
> "osd_sense_attribute_identification"
> "attr_page=0x%x attr_id=0x%x\n",
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
