Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec6a0a41 authored by Boaz Harrosh's avatar Boaz Harrosh Committed by James Bottomley
Browse files

[SCSI] libosd: Fix bug in attr_page handling 



The _osd_req_finalize_attr_page was off by a mile, when trying to
append the enc_get_attr segment instead of the proper set_attr segment.

Also properly support when we don't have any attribute to set while
getting a full page. And when clearing an attribute by setting it's
size to zero.

Reported-by: default avatarJohn Chandy <john.chandy@uconn.edu>
Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 391cbf46

drivers/scsi/osd/osd_initiator.c

+10 −6
Original line number Diff line number Diff line
@@ -1218,17 +1218,18 @@ int osd_req_add_get_attr_page(struct osd_request *or, 
	or->get_attr.buff = attar_page;

	or->get_attr.total_bytes = max_page_len;



	or->set_attr.buff = set_one_attr->val_ptr;

	or->set_attr.total_bytes = set_one_attr->len;



	cdbh->attrs_page.get_attr_page = cpu_to_be32(page_id);

	cdbh->attrs_page.get_attr_alloc_length = cpu_to_be32(max_page_len);

	/* ocdb->attrs_page.get_attr_offset; */



	if (!set_one_attr || !set_one_attr->attr_page)

		return 0; /* The set is optional */



	or->set_attr.buff = set_one_attr->val_ptr;

	or->set_attr.total_bytes = set_one_attr->len;



	cdbh->attrs_page.set_attr_page = cpu_to_be32(set_one_attr->attr_page);

	cdbh->attrs_page.set_attr_id = cpu_to_be32(set_one_attr->attr_id);

	cdbh->attrs_page.set_attr_length = cpu_to_be32(set_one_attr->len);

	/* ocdb->attrs_page.set_attr_offset; */

	return 0;

}

EXPORT_SYMBOL(osd_req_add_get_attr_page);
@@ -1248,11 +1249,14 @@ static int _osd_req_finalize_attr_page(struct osd_request *or) 
	if (ret)

		return ret;



	if (or->set_attr.total_bytes == 0)

		return 0;



	/* set one value */

	cdbh->attrs_page.set_attr_offset =

		osd_req_encode_offset(or, or->out.total_bytes, &out_padding);



	ret = _req_append_segment(or, out_padding, &or->enc_get_attr, NULL,

	ret = _req_append_segment(or, out_padding, &or->set_attr, NULL,

				  &or->out);

	return ret;

}