Skip to contentSkip to conversation

IB/srp: Avoid that sg_reset -d ${srp_device} triggers an infinite loop

PATCH Applied Bart Van Assche 2 participants 2 messages Sep 18, 2018 – Sep 19, 2018

Subsystems (3)
lore
Share & tools
lore

Bart Van Assche

author maintainer
#0 lore raw

PATCH 1/1 IB/srp: Avoid that sg_reset -d ${srp_device} triggers an infinite loop

Use different loop variables for the inner and outer loop. This avoids that an infinite loop occurs if there are more RDMA channels than target->req_ring_size.

Fixes d92c0da71a35 ("IB/srp: Add multichannel support")
Cc Max Gurtovoy <[email protected]>
Cc Laurence Oberman <[email protected]>
---
 drivers/infiniband/ulp/srp/ib_srp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/ulp/srp/ib_srp.c +3 -3
index 444d16520506..0b34e909505f 100644
@@ -2951,7 +2951,7 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
 {
 	struct srp_target_port *target = host_to_target(scmnd->device->host);
 	struct srp_rdma_ch *ch;
-	int i;
+	int i, j;
 	u8 status;
 
 	shost_printk(KERN_ERR, target->scsi_host, "SRP reset_device called\n");
@@ -2965,8 +2965,8 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
 
 	for (i = 0; i < target->ch_count; i++) {
 		ch = &target->ch[i];
-		for (i = 0; i < target->req_ring_size; ++i) {
-			struct srp_request *req = &ch->req_ring[i];
+		for (j = 0; j < target->req_ring_size; ++j) {
+			struct srp_request *req = &ch->req_ring[j];
 
 			srp_finish_req(ch, req, scmnd->device, DID_RESET << 16);
 		}
Signature · 1 line
2.18.0
#1 lore raw
Quoted 4 lines · Bart Van Assche

Use different loop variables for the inner and outer loop. This avoids that an infinite loop occurs if there are more RDMA channels than target->req_ring_size.

Quoted 8 lines
Fixes d92c0da71a35 ("IB/srp: Add multichannel support")
Cc Max Gurtovoy <[email protected]>
Cc Laurence Oberman <[email protected]>
---
 drivers/infiniband/ulp/srp/ib_srp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Applied to for-rc, thanks

Jason