GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-04 21:31:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/sbc: Fix sbc_dif_verify inconsistent map/unmap

Browse source 
Fix map/unmap consistency and get rid of a redundant
local variable psg.

Reported-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Sagi Grimberg 2015-04-19 20:27:21 +03:00 • committed by Nicholas Bellinger
parent 8287fa5fb4
commit 414e462727
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/target/target_core_sbc.c
View file

@ -1312,30 +1312,30 @@ EXPORT_SYMBOL(sbc_dif_copy_prot);
sense_reason_t sense_reason_t
sbc_dif_verify(struct se_cmd *cmd, sector_t start, unsigned int sectors, sbc_dif_verify(struct se_cmd *cmd, sector_t start, unsigned int sectors,
unsigned int ei_lba, struct scatterlist *sg, int sg_off) unsigned int ei_lba, struct scatterlist *psg, int psg_off)
{ {
struct se_device *dev = cmd->se_dev; struct se_device *dev = cmd->se_dev;
struct se_dif_v1_tuple *sdt; struct se_dif_v1_tuple *sdt;
struct scatterlist *dsg, *psg = sg; struct scatterlist *dsg;
sector_t sector = start; sector_t sector = start;
void *daddr, *paddr; void *daddr, *paddr;
int i, j, offset = sg_off; int i, j;
sense_reason_t rc; sense_reason_t rc;
for_each_sg(cmd->t_data_sg, dsg, cmd->t_data_nents, i) { for_each_sg(cmd->t_data_sg, dsg, cmd->t_data_nents, i) {
daddr = kmap_atomic(sg_page(dsg)) + dsg->offset; daddr = kmap_atomic(sg_page(dsg)) + dsg->offset;
paddr = kmap_atomic(sg_page(psg)) + sg->offset; paddr = kmap_atomic(sg_page(psg)) + psg->offset;
for (j = 0; j < dsg->length; j += dev->dev_attrib.block_size) { for (j = 0; j < dsg->length; j += dev->dev_attrib.block_size) {
if (offset >= psg->length) { if (psg_off >= psg->length) {
kunmap_atomic(paddr); kunmap_atomic(paddr - psg->offset);
psg = sg_next(psg); psg = sg_next(psg);
paddr = kmap_atomic(sg_page(psg)) + psg->offset; paddr = kmap_atomic(sg_page(psg)) + psg->offset;
offset = 0; psg_off = 0;
} }
sdt = paddr + offset; sdt = paddr + psg_off;
pr_debug("DIF READ sector: %llu guard_tag: 0x%04x" pr_debug("DIF READ sector: %llu guard_tag: 0x%04x"
" app_tag: 0x%04x ref_tag: %u\n", " app_tag: 0x%04x ref_tag: %u\n",
@ -1344,26 +1344,26 @@ sbc_dif_verify(struct se_cmd *cmd, sector_t start, unsigned int sectors,
if (sdt->app_tag == cpu_to_be16(0xffff)) { if (sdt->app_tag == cpu_to_be16(0xffff)) {
sector++; sector++;
offset += sizeof(struct se_dif_v1_tuple); psg_off += sizeof(struct se_dif_v1_tuple);
continue; continue;
} }
rc = sbc_dif_v1_verify(cmd, sdt, daddr + j, sector, rc = sbc_dif_v1_verify(cmd, sdt, daddr + j, sector,
ei_lba); ei_lba);
if (rc) { if (rc) {
kunmap_atomic(paddr); kunmap_atomic(paddr - psg->offset);
kunmap_atomic(daddr); kunmap_atomic(daddr - dsg->offset);
cmd->bad_sector = sector; cmd->bad_sector = sector;
return rc; return rc;
} }
sector++; sector++;
ei_lba++; ei_lba++;
offset += sizeof(struct se_dif_v1_tuple); psg_off += sizeof(struct se_dif_v1_tuple);
} }
kunmap_atomic(paddr); kunmap_atomic(paddr - psg->offset);
kunmap_atomic(daddr); kunmap_atomic(daddr - dsg->offset);
} }
return 0; return 0;