leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Fix off-by-one errors in blk_status_to_errno() and print_req_error()

Browse Source 
This was detected by the smatch static analyzer.

Fixes: commit 2a842acab1 ("block: introduce new block status code type")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche 2017-06-21 10:55:46 -07:00 committed by Jens Axboe
parent e0fc443a86
commit 34bd9c1c4f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/blk-core.c
View File

@ -169,7 +169,7 @@ int blk_status_to_errno(blk_status_t status)
{ {
int idx = (__force int)status; int idx = (__force int)status;
if (WARN_ON_ONCE(idx > ARRAY_SIZE(blk_errors))) if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors)))
return -EIO; return -EIO;
return blk_errors[idx].errno; return blk_errors[idx].errno;
} }
@ -179,7 +179,7 @@ static void print_req_error(struct request *req, blk_status_t status)
{ {
int idx = (__force int)status; int idx = (__force int)status;
if (WARN_ON_ONCE(idx > ARRAY_SIZE(blk_errors))) if (WARN_ON_ONCE(idx >= ARRAY_SIZE(blk_errors)))
return; return;
printk_ratelimited(KERN_ERR "%s: %s error, dev %s, sector %llu\n", printk_ratelimited(KERN_ERR "%s: %s error, dev %s, sector %llu\n",