diff options
| author | Linus Torvalds | 2019-07-06 18:56:20 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-06 18:56:20 +0200 |
| commit | 4f8b49092c37cf0c87c43bb2698d43c71cf0e4e5 (patch) | |
| tree | b165dffcdb9cbe09a418d1af50d94d72dfa228c3 /drivers/target/target_core_iblock.c | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported (diff) | |
| download | kernel-qcow2-linux-4f8b49092c37cf0c87c43bb2698d43c71cf0e4e5.tar.gz kernel-qcow2-linux-4f8b49092c37cf0c87c43bb2698d43c71cf0e4e5.tar.xz kernel-qcow2-linux-4f8b49092c37cf0c87c43bb2698d43c71cf0e4e5.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two iscsi fixes.
One for an oops in the client which can be triggered by the server
authentication protocol and the other in the target code which causes
data corruption"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported
scsi: target/iblock: Fix overrun in WRITE SAME emulation
Diffstat (limited to 'drivers/target/target_core_iblock.c')
| -rw-r--r-- | drivers/target/target_core_iblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index f4a075303e9a..6949ea8bc387 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c @@ -502,7 +502,7 @@ iblock_execute_write_same(struct se_cmd *cmd) /* Always in 512 byte units for Linux/Block */ block_lba += sg->length >> SECTOR_SHIFT; - sectors -= 1; + sectors -= sg->length >> SECTOR_SHIFT; } iblock_submit_bios(&list); |