Skip to contentSkip to conversation

rnbd: Fix an error code in process_rdma()

PATCH In review Dan Carpenter 3 participants 3 messages Aug 26, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rnbd: Fix an error code in process_rdma()

The error code is uninitialized on this error path.

Fixes 735d77d4fd28 ("rnbd: remove rnbd_dev_submit_io")
---
 drivers/block/rnbd/rnbd-srv.c | 1 +
 1 file changed, 1 insertion(+)
drivers/block/rnbd/rnbd-srv.c +1 -0
index 0fb94843a495..5b69bc56b225 100644
@@ -149,6 +149,7 @@ static int process_rdma(struct rtrs_srv *sess,
 	bio = rnbd_bio_map_kern(data, sess_dev->rnbd_dev->ibd_bio_set, datalen, GFP_KERNEL);
 	if (IS_ERR(bio)) {
 		rnbd_srv_err(sess_dev, "Failed to generate bio, err: %ld\n", PTR_ERR(bio));
+		err = PTR_ERR(bio);
 		goto sess_dev_put;
 	}
 
Signature · 1 line
2.28.0
#1 lore raw
Quoted 13 lines · Dan Carpenter

The error code is uninitialized on this error path.

Fixes 735d77d4fd28 ("rnbd: remove rnbd_dev_submit_io")
---
  drivers/block/rnbd/rnbd-srv.c | 1 +
  1 file changed, 1 insertion(+)
drivers/block/rnbd/rnbd-srv.c +0 -0
index 0fb94843a495..5b69bc56b225 100644

drivers/block/rnbd/rnbd-srv.c static int process_rdma(struct rtrs_srv *sess, · line 155

Quoted 7 lines
drivers/block/rnbd/rnbd-srv.c +1 -0
@@ -149,6 +149,7 @@ static int process_rdma(struct rtrs_srv *sess,
  	bio = rnbd_bio_map_kern(data, sess_dev->rnbd_dev->ibd_bio_set, datalen, GFP_KERNEL);
  	if (IS_ERR(bio)) {
  		rnbd_srv_err(sess_dev, "Failed to generate bio, err: %ld\n", PTR_ERR(bio));
+		err = PTR_ERR(bio);
  		goto sess_dev_put;
  	}
 

Thanks for the fix, Acked-by: Guoqing Jiang <[email protected]>

Guoqing

maintainer
#2 lore raw
In reply to Dan Carpenter
Quoted 1 line · Dan Carpenter

The error code is uninitialized on this error path.

The fix is in Linus's tree:

commit 17bc10300c69bd51b82983cdadafa0a7791f074e

Author: Nathan Chancellor <[email protected]>
Date:   Mon Aug 17 23:49:25 2020 -0700

block/rnbd: Ensure err is always initialized in process_rdma

Signature · 1 line
Jens Axboe