diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-02-13 22:27:40 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-18 13:22:28 +0100 |
| commit | 84ba11a6ee549b2727a3b83d3c1b455df1c7ebcd (patch) | |
| tree | a6353a6f41a7ae27bc69f0f23a8fdf3e5f075051 | |
| parent | 9113c468b621ddb74f2395564720862faa3a083d (diff) | |
| download | linux-stable-84ba11a6ee549b2727a3b83d3c1b455df1c7ebcd.tar.gz linux-stable-84ba11a6ee549b2727a3b83d3c1b455df1c7ebcd.tar.bz2 linux-stable-84ba11a6ee549b2727a3b83d3c1b455df1c7ebcd.zip | |
target: Check for LBA + sectors wrap-around in sbc_parse_cdb
commit aa179935edea9a64dec4b757090c8106a3907ffa upstream.
This patch adds a check to sbc_parse_cdb() in order to detect when
an LBA + sector vs. end-of-device calculation wraps when the LBA is
sufficently large enough (eg: 0xFFFFFFFFFFFFFFFF).
Cc: Martin Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/target/target_core_sbc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c index 92e6c510e5d0..70b0d265c37d 100644 --- a/drivers/target/target_core_sbc.c +++ b/drivers/target/target_core_sbc.c @@ -562,7 +562,8 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops) unsigned long long end_lba; end_lba = dev->transport->get_blocks(dev) + 1; - if (cmd->t_task_lba + sectors > end_lba) { + if (((cmd->t_task_lba + sectors) < cmd->t_task_lba) || + ((cmd->t_task_lba + sectors) > end_lba)) { pr_err("cmd exceeds last lba %llu " "(lba %llu, sectors %u)\n", end_lba, cmd->t_task_lba, sectors); |