From ee8fb37c47a0b2ffadceeef5e141e7cf76ab029d Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Mon, 16 Nov 2009 20:47:07 +0200 Subject: [PATCH] --- yaml --- r: 173719 b: refs/heads/master c: 71ecb74b15377a6c0e0e6ea95d4b549580fb4d48 h: refs/heads/master i: 173717: aa895abaf229c1abb3b40e2831aa31ce2c97db5d 173715: 50c42430d6d35dc03ed7636dba364f0c1175d133 173711: 22080e8469af81d9889bde3057e48e8c09cf8343 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/osd/osd_initiator.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 00cd70a2280a..14691e279fe2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cdd6410e5a1665823f2a048fc7f8f6a8384be1d +refs/heads/master: 71ecb74b15377a6c0e0e6ea95d4b549580fb4d48 diff --git a/trunk/drivers/scsi/osd/osd_initiator.c b/trunk/drivers/scsi/osd/osd_initiator.c index 60b7ca1e9bc0..5e90d19fddf8 100644 --- a/trunk/drivers/scsi/osd/osd_initiator.c +++ b/trunk/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",