mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 12:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst_targ: Also intercept READ CAPACITY(16)

Browse Source 
The scst_block_generic_dev_done() function parses the READ CAPACITY
response. Add support for parsing the READ CAPACITY(16) response.
Additionally, add a check whether the response buffer is big enough
to hold the sector size.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
This commit is contained in:
Bart Van Assche
2015-04-14 11:35:57 +02:00
parent acacb09327
commit 33a782e549
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scst/src/scst_lib.c
View File

@@ -8261,13 +8261,16 @@ int scst_block_generic_dev_done(struct scst_cmd *cmd,
int opcode = cmd->cdb[0];
int status = cmd->status;
int res = SCST_CMD_STATE_DEFAULT;
int sect_sz_off;
TRACE_ENTRY();
/* Do not call this function for aborted commands. */
WARN_ON_ONCE(!cmd->completed);
if (unlikely(opcode == READ_CAPACITY)) {
if (unlikely(opcode == READ_CAPACITY ||
(opcode == SERVICE_ACTION_IN_16 &&
cmd->cdb[1] == SAI_READ_CAPACITY_16))) {
if ((status == SAM_STAT_GOOD) || (status == SAM_STAT_CONDITION_MET)) {
/* Always keep track of disk capacity */
int buffer_size, sector_size, sh;
@@ -8283,14 +8286,19 @@ int scst_block_generic_dev_done(struct scst_cmd *cmd,
goto out;
}
sector_size = get_unaligned_be32(&buffer[4]);
sect_sz_off = opcode == READ_CAPACITY ? 4 : 8;
if (buffer_size < sect_sz_off + 4)
goto out;
sector_size = get_unaligned_be32(&buffer[sect_sz_off]);
scst_put_buf_full(cmd, buffer);
if (sector_size != 0)
if (sector_size != 0) {
sh = scst_calc_block_shift(sector_size);
else
sh = 0;
set_block_shift(cmd, sh);
TRACE_DBG("block_shift %d", sh);
set_block_shift(cmd, sh);
TRACE_DBG("block_shift %d", sh);
} else {
PRINT_ERROR("Sector size in %s response is 0",
cmd->op_name);
}
}
} else {
/* It's all good */