ublk: fix 'warn: variable dereferenced before check 'req'' from Smatch
Subsystems (2)
PATCH 1/1 ublk: fix 'warn: variable dereferenced before check 'req'' from Smatch
The added check of 'req_op(req) == REQ_OP_ZONE_APPEND' should have been done after the request is confirmed as valid.
Actually here, the request should always been true, so add one WARN_ON_ONCE(!req), meantime move the zone_append check after checking the request.
--- drivers/block/ublk_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/block/ublk_drv.c +3 -1
@@ -1400,11 +1400,13 @@ static void ublk_commit_completion(struct ublk_device *ub,/* find the io request and complete */ req =blk_mq_tag_to_rq (ub->tag_set.tags[qid], tag); +if (WARN_ON_ONCE (unlikely (!req))) +return ;if (req_op (req) ==REQ_OP_ZONE_APPEND ) req->__sector = ub_cmd->zone_append_lba; -if (req &&likely (!blk_should_fake_timeout (req->q))) +if (likely (!blk_should_fake_timeout (req->q)))ublk_put_req_ref (ubq, req); }
Signature · 1 line
2.40.1
Quoted 8 lines · Ming Lei
The added check of '
req_op(req)==REQ_OP_ZONE_APPEND' should have been done after the request is confirmed as valid.Actually here, the request should always been true, so add one
WARN_ON_ONCE(!req), meantime move thezone_appendcheck after checking the request.[...]
Applied, thanks!
[1/1] ublk: fix 'warn: variable dereferenced before check 'req'' from Smatch
commit: e24721e441a7c640e4e7b2b63c23c06d9a750880
Best regards,
Signature · 1 line
Jens Axboe
Quoted 20 lines · Ming Lei
The added check of '
req_op(req)==REQ_OP_ZONE_APPEND' should have been done after the request is confirmed as valid.Actually here, the request should always been true, so add one
WARN_ON_ONCE(!req), meantime move thezone_appendcheck after checking the request.Cc Andreas Hindborg <[email protected]>Reported-by Dan Carpenter <[email protected]>Fixes 29802d7ca33b ("ublk: enable zoned storage support")Signed-off-by Ming Lei <[email protected]>--- drivers/block/ublk_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/block/ublk_drv.c +0
-0
drivers/block/ublk_drv.c static void ublk_commit_completion(struct ublk_device *ub, · line 1403
Quoted 4 lines
drivers/block/ublk_drv.c +1
-0@@ -1400,11 +1400,13 @@ static void ublk_commit_completion(struct ublk_device *ub,/* find the io request and complete */ req =blk_mq_tag_to_rq (ub->tag_set.tags[qid], tag); +if (WARN_ON_ONCE (unlikely (!req)))
WARN_ON_ONCE() already has an unlikely() built in.
regards,
dan carpenter