Page MenuHomeFreeBSD
Files F142675478

D46775.id143710.diff
No OneTemporary
Actions

D46775.id143710.diff
View Options

diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -7456,33 +7456,26 @@
break;
case RSO_OPTIONS_OC:
if (ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) {
- ctl_set_invalid_field(/*ctsio*/ ctsio,
- /*sks_valid*/ 1,
- /*command*/ 1,
- /*field*/ 2,
- /*bit_valid*/ 1,
- /*bit*/ 2);
- ctl_done((union ctl_io *)ctsio);
- return (CTL_RETVAL_COMPLETE);
+ goto invalid_options;
}
total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32;
break;
case RSO_OPTIONS_OC_SA:
if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) == 0 ||
service_action >= 32) {
- goto invalid;
+ goto invalid_options;
}
total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32;
break;
case RSO_OPTIONS_OC_ASA:
if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) != 0 &&
service_action >= 32) {
- goto invalid;
+ goto invalid_options;
}
total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32;
break;
default:
-invalid:
+invalid_options:
ctl_set_invalid_field(/*ctsio*/ ctsio,
/*sks_valid*/ 1,
/*command*/ 1,

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 23, 3:22 AM (11 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27842460
Default Alt Text
D46775.id143710.diff (1 KB)

Event Timeline