mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 18:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst: Fix WRITE SAME parsing

Browse Source 
Check bit 4 instead of bit 0 as the ANCHOR bit. Handle the NDOB
bit correctly.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6347 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-16 23:51:26 +00:00
parent 20986f4c1b
commit 47efee04ce
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -3696,14 +3696,16 @@ static enum compl_status_e vdisk_exec_write_same(struct vdisk_cmd_params *p)
TRACE_ENTRY();
if (unlikely(cmd->cdb[ctrl_offs] & 1)) {
if (unlikely(cmd->cdb[ctrl_offs] & 0x10)) {
TRACE_DBG("%s", "ANCHOR not supported");
scst_set_invalid_field_in_cdb(cmd, ctrl_offs,
SCST_INVAL_FIELD_BIT_OFFS_VALID | 0);
SCST_INVAL_FIELD_BIT_OFFS_VALID | 4);
goto out;
}
if (unlikely(cmd->data_len <= 0)) {
PRINT_ERROR("WRITE SAME: refused data_len = %#llx",
cmd->data_len);
scst_set_invalid_field_in_cdb(cmd, cmd->len_off, 0);
goto out;
}

38
scst/src/scst_lib.c
View File

@@ -10154,31 +10154,57 @@ static int get_cdb_info_lba_8_len_4_rdprotect32(struct scst_cmd *cmd,
return scst_parse_rdprotect32(cmd);
}
static int get_cdb_info_write_same(struct scst_cmd *cmd,
const struct scst_sdbops *sdbops,
const bool ndob)
{
const uint8_t ctrl_offs = cmd->cdb_len < 32 ? 1 : 10;
const bool anchor = (cmd->cdb[ctrl_offs] >> 4) & 1;
const bool unmap = (cmd->cdb[ctrl_offs] >> 3) & 1;
if (!unmap && (anchor || ndob)) {
PRINT_ERROR("Received invalid %s command (UNMAP = %d;"
" ANCHOR = %d; NDOB = %d)",
scst_get_opcode_name(cmd), unmap, anchor, ndob);
scst_set_invalid_field_in_cdb(cmd, ctrl_offs,
SCST_INVAL_FIELD_BIT_OFFS_VALID | (ndob ? 0 : 4));
return 1;
}
if (ndob) {
cmd->bufflen = 0;
cmd->data_direction = SCST_DATA_NONE;
} else {
cmd->bufflen = 1;
cmd->data_direction = SCST_DATA_WRITE;
}
return cmd->cdb_len < 32 ? scst_parse_wrprotect(cmd) :
scst_parse_wrprotect32(cmd);
}
static int get_cdb_info_write_same10(struct scst_cmd *cmd,
const struct scst_sdbops *sdbops)
{
cmd->lba = get_unaligned_be32(cmd->cdb + sdbops->info_lba_off);
cmd->bufflen = 1;
cmd->data_len = get_unaligned_be16(cmd->cdb + sdbops->info_len_off);
return scst_parse_wrprotect(cmd);
return get_cdb_info_write_same(cmd, sdbops, false);
}
static int get_cdb_info_write_same16(struct scst_cmd *cmd,
const struct scst_sdbops *sdbops)
{
cmd->lba = get_unaligned_be64(cmd->cdb + sdbops->info_lba_off);
cmd->bufflen = 1;
cmd->data_len = get_unaligned_be32(cmd->cdb + sdbops->info_len_off);
return scst_parse_wrprotect(cmd);
return get_cdb_info_write_same(cmd, sdbops, cmd->cdb[1] & 1 /*NDOB*/);
}
static int get_cdb_info_write_same32(struct scst_cmd *cmd,
const struct scst_sdbops *sdbops)
{
cmd->lba = get_unaligned_be64(cmd->cdb + sdbops->info_lba_off);
cmd->bufflen = 1;
cmd->data_len = get_unaligned_be32(cmd->cdb + sdbops->info_len_off);
return scst_parse_wrprotect32(cmd);
return get_cdb_info_write_same(cmd, sdbops, cmd->cdb[1] & 1 /*NDOB*/);
}
static int scst_set_cmd_from_cdb_info(struct scst_cmd *cmd,