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

scst_disk: Avoid overflow for large max_hw_sectors values

Browse Source 
Avoid that max_sectors << block_shift overflows for large max_sectors
values by changing the test ((max_sectors << block_shift) < PAGE_SIZE)
into (max_sectors < (PAGE_SIZE >> block_shift)).

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6136 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2015-02-28 03:35:59 +00:00
parent 88d8018183
commit f59f2ab6ab
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scst/src/dev_handlers/scst_disk.c
View File

@@ -381,7 +381,7 @@ static int disk_exec(struct scst_cmd *cmd)
struct scatterlist *sg, *start_sg;
int cur_sg_cnt;
int sg_tablesize = cmd->dev->scsi_dev->host->sg_tablesize;
int max_sectors;
unsigned int max_sectors;
int num, j, block_shift = dev->block_shift;
TRACE_ENTRY();
@@ -392,15 +392,10 @@ static int disk_exec(struct scst_cmd *cmd)
*/
max_sectors = queue_max_hw_sectors(dev->scsi_dev->request_queue);
if (unlikely(((max_sectors << block_shift) & ~PAGE_MASK) != 0)) {
int mlen = max_sectors << block_shift;
int pg = ((mlen >> PAGE_SHIFT) + ((mlen & ~PAGE_MASK) != 0)) - 1;
int adj_len = pg << PAGE_SHIFT;
max_sectors = adj_len >> block_shift;
if (max_sectors == 0) {
PRINT_ERROR("Too low max sectors %d", max_sectors);
goto out_error;
}
if (unlikely(max_sectors < (PAGE_SIZE >> block_shift))) {
PRINT_ERROR("Too low max sectors: %u << %u < %lu", max_sectors,
block_shift, PAGE_SIZE);
goto out_error;
}
if (unlikely((cmd->bufflen >> block_shift) > max_sectors)) {