openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/sbc: Fix sbc_dif_copy_prot addr offset bug 

This patch fixes a bug in sbc_dif_copy_prot() where the updated addr
offset did not take into account the case where the associated
scatterlist had not been incremented.

This addresses the case where incoming protection scatterlists may
contain a length smaller than PAGE_SIZE across multiple entires,
when the target protection scatterlists are always being explicitly
filled up to PAGE_SIZE before adding another entry.

Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Sagi Grimberg <sagig@mellanox.com>
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Nicholas Bellinger 2014-02-23 12:52:44 +00:00
parent 84197a36e9
commit 10762e8048
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/target/target_core_sbc.c
View File

@ -1074,7 +1074,7 @@ sbc_dif_copy_prot(struct se_cmd *cmd, unsigned int sectors, bool read,
struct scatterlist *psg; struct scatterlist *psg;
void *paddr, *addr; void *paddr, *addr;
unsigned int i, len, left; unsigned int i, len, left;
unsigned int offset = 0; unsigned int offset = sg_off;
left = sectors * dev->prot_length; left = sectors * dev->prot_length;
@ -1084,11 +1084,10 @@ sbc_dif_copy_prot(struct se_cmd *cmd, unsigned int sectors, bool read,
if (offset >= sg->length) { if (offset >= sg->length) {
sg = sg_next(sg); sg = sg_next(sg);
offset = 0; offset = 0;
sg_off = sg->offset;
} }
paddr = kmap_atomic(sg_page(psg)) + psg->offset; paddr = kmap_atomic(sg_page(psg)) + psg->offset;
addr = kmap_atomic(sg_page(sg)) + sg_off; addr = kmap_atomic(sg_page(sg)) + sg->offset + offset;
if (read) if (read)
memcpy(paddr, addr, len); memcpy(paddr, addr, len);