mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
libata: fix off-by-one error in ata_tf_read_block()
ata_tf_read_block() has off-by-one error when converting CHS address to LBA. The bug isn't very visible because ata_tf_read_block() is used only when generating sense data for a failed RW command and CHS addressing isn't used too often these days. This problem was spotted by Atsushi Nemoto. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
1b549dcbf6
commit
ac8672ea92
1 changed files with 7 additions and 1 deletions
|
@ -709,7 +709,13 @@ u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev)
|
|||
head = tf->device & 0xf;
|
||||
sect = tf->lbal;
|
||||
|
||||
block = (cyl * dev->heads + head) * dev->sectors + sect;
|
||||
if (!sect) {
|
||||
ata_dev_printk(dev, KERN_WARNING, "device reported "
|
||||
"invalid CHS sector 0\n");
|
||||
sect = 1; /* oh well */
|
||||
}
|
||||
|
||||
block = (cyl * dev->heads + head) * dev->sectors + sect - 1;
|
||||
}
|
||||
|
||||
return block;
|
||||
|
|
Loading…
Reference in a new issue