[SCSI] libosd: bug in osd_req_decode_sense_full()

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@gmail.com>
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 60b7ca1e9bc037387ba3a0bc2248ea17400b8de4..5e90d19fddf84932ace9870d2116fdc0c0b48fea 100644 (file)
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -1583,15 +1583,14 @@ 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);
-                       int i = 0;
+                       unsigned len = min(cur_len, sense_len);
                        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",