diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2012-03-29 21:52:20 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-10 10:31:00 -0700 |
| commit | 2471ec5895b2e3eeb55f4386a793123c8a5bf88a (patch) | |
| tree | 62a1d542026c618064a512d036a56e52a81354ee /drivers/staging/rts5139/ms.c | |
| parent | staging/telephony/ixj.c: delete trailing whitespace (diff) | |
| download | linux-dev-2471ec5895b2e3eeb55f4386a793123c8a5bf88a.tar.xz linux-dev-2471ec5895b2e3eeb55f4386a793123c8a5bf88a.zip | |
Staging: rts5139: a couple off by one fixes
Inside the array we check ms_start_idx[seg_no + 1] so on the last round
through we end up going past the end of the array.
Also if we don't break out of the loop early then we are beyond the end
of the array there as well. With this change, if we don't find what we
are looking for, we end on the last element of the array.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rts5139/ms.c')
| -rw-r--r-- | drivers/staging/rts5139/ms.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/rts5139/ms.c b/drivers/staging/rts5139/ms.c index b0e9071c8e52..02aad2d242cb 100644 --- a/drivers/staging/rts5139/ms.c +++ b/drivers/staging/rts5139/ms.c @@ -3864,7 +3864,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip, log_blk = (u16) (start_sector >> ms_card->block_shift); start_page = (u8) (start_sector & ms_card->page_off); - for (seg_no = 0; seg_no < sizeof(ms_start_idx) / 2; seg_no++) { + for (seg_no = 0; seg_no < ARRAY_SIZE(ms_start_idx) - 1; seg_no++) { if (log_blk < ms_start_idx[seg_no + 1]) break; } @@ -4020,7 +4020,8 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rts51x_chip *chip, log_blk++; - for (seg_no = 0; seg_no < sizeof(ms_start_idx) / 2; seg_no++) { + for (seg_no = 0; seg_no < ARRAY_SIZE(ms_start_idx) - 1; + seg_no++) { if (log_blk < ms_start_idx[seg_no + 1]) break; } |