Skip to contentSkip to conversation

RDMA/rtrs: server: main functionality

bug report Applied Dan Carpenter 3 participants 5 messages May 19, 2020

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

Hello Jack Wang,

The patch 9cb837480424: "RDMA/rtrs: server: main functionality" from May 11, 2020, leads to the following static checker warning:

	drivers/infiniband/ulp/rtrs/rtrs-srv.c:1224 rtrs_srv_rdma_done()
	warn: array off by one? 'sess->mrs[msg_id]'

drivers/infiniband/ulp/rtrs/rtrs-srv.c
1207 }
1208 rtrs_from_imm(be32_to_cpu(wc->ex.imm_data),
1209 &imm_type, &imm_payload);
1210 if (likely(imm_type == RTRS_IO_REQ_IMM)) {
1211 u32 msg_id, off;
1212 void *data;
1213

  1214                          msg_id = imm_payload >> sess->mem_bits;
  1215                          off = imm_payload & ((1 << sess->mem_bits) - 1);
  1216                          if (unlikely(msg_id > srv->queue_depth ||
                                                    ^

This should definitely be >=

  1217                                       off > max_chunk_size)) {
                                                 ^

My only question is should "off" be >=. I feel like probably it should but I'm not sure.

  1218                                  rtrs_err(s, "Wrong msg_id %u, off %u\n",
  1219                                            msg_id, off);
  1220                                  close_sess(sess);
  1221                                  return;
  1222                          }
  1223                          if (always_invalidate) {
  1224                                  struct rtrs_srv_mr *mr = &sess->mrs[msg_id];
                                                                 ^^^^^^^^^^^^^^^^^^
  1225  
  1226                                  mr->msg_off = off;
  1227                                  mr->msg_id = msg_id;
  1228                                  err = rtrs_srv_inv_rkey(con, mr);
  1229                                  if (unlikely(err)) {
  1230                                          rtrs_err(s, "rtrs_post_recv(), err: %d\n",
  1231                                                    err);
  1232                                          close_sess(sess);
  1233                                          break;
  1234                                  }
  1235                          } else {
  1236                                  data = page_address(srv->chunks[msg_id]) + off;
  1237                                  process_io_req(con, data, msg_id, off);
  1238                          }
  1239                  } else if (imm_type == RTRS_HB_MSG_IMM) {
  1240                          WARN_ON(con->c.cid);
  1241                          rtrs_send_hb_ack(&sess->s);
  1242                  } else if (imm_type == RTRS_HB_ACK_IMM) {

regards,
dan carpenter

#1 lore raw

Hi Dan,

Quoted 17 lines · Dan Carpenter

Hello Jack Wang,

The patch 9cb837480424: "RDMA/rtrs: server: main functionality" from May 11, 2020, leads to the following static checker warning:

        drivers/infiniband/ulp/rtrs/rtrs-srv.c:1224 rtrs_srv_rdma_done()
        warn: array off by one? 'sess->mrs[msg_id]'

drivers/infiniband/ulp/rtrs/rtrs-srv.c
1207 }
1208 rtrs_from_imm(be32_to_cpu(wc->ex.imm_data),
1209 &imm_type, &imm_payload);
1210 if (likely(imm_type == RTRS_IO_REQ_IMM)) {
1211 u32 msg_id, off;
1212 void *data;
1213

Quoted 5 lines
  1214                          msg_id = imm_payload >> sess->mem_bits;
  1215                          off = imm_payload & ((1 << sess->mem_bits) - 1);
  1216                          if (unlikely(msg_id > srv->queue_depth ||
                                                    ^

This should definitely be >=

Definitely, thank you.

Quoted 5 lines
  1217                                       off > max_chunk_size)) {
                                                 ^

My only question is should "off" be >=. I feel like probably it should but I'm not sure.

Here also, yes.

Quoted 30 lines
  1218                                  rtrs_err(s, "Wrong msg_id %u, off %u\n",
  1219                                            msg_id, off);
  1220                                  close_sess(sess);
  1221                                  return;
  1222                          }
  1223                          if (always_invalidate) {
  1224                                  struct rtrs_srv_mr *mr = &sess->mrs[msg_id];
                                                                 ^^^^^^^^^^^^^^^^^^
  1225
  1226                                  mr->msg_off = off;
  1227                                  mr->msg_id = msg_id;
  1228                                  err = rtrs_srv_inv_rkey(con, mr);
  1229                                  if (unlikely(err)) {
  1230                                          rtrs_err(s, "rtrs_post_recv(), err: %d\n",
  1231                                                    err);
  1232                                          close_sess(sess);
  1233                                          break;
  1234                                  }
  1235                          } else {
  1236                                  data = page_address(srv->chunks[msg_id]) + off;
  1237                                  process_io_req(con, data, msg_id, off);
  1238                          }
  1239                  } else if (imm_type == RTRS_HB_MSG_IMM) {
  1240                          WARN_ON(con->c.cid);
  1241                          rtrs_send_hb_ack(&sess->s);
  1242                  } else if (imm_type == RTRS_HB_ACK_IMM) {

regards,
dan carpenter

#2 lore raw

PATCH 1/1 RDMA/rtrs: Fix a couple off by one bugs in rtrs_srv_rdma_done()

These > comparisons should be >= to prevent accessing one element beyond the end of the buffer.

Fixes 9cb837480424 ("RDMA/rtrs: server: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-srv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-srv.c +2 -2
index 658c8999cb0d..0b53b79b0e27 100644
@@ -1213,8 +1213,8 @@ static void rtrs_srv_rdma_done(struct ib_cq *cq, struct ib_wc *wc)
 
 			msg_id = imm_payload >> sess->mem_bits;
 			off = imm_payload & ((1 << sess->mem_bits) - 1);
-			if (unlikely(msg_id > srv->queue_depth ||
-				     off > max_chunk_size)) {
+			if (unlikely(msg_id >= srv->queue_depth ||
+				     off >= max_chunk_size)) {
 				rtrs_err(s, "Wrong msg_id %u, off %u\n",
 					  msg_id, off);
 				close_sess(sess);
Signature · 1 line
2.26.2
Acked-by on v1 1/1
#3 lore raw

Re: [PATCH] RDMA/rtrs: Fix a couple off by one bugs in rtrs_srv_rdma_done()

Quoted 26 lines · Dan Carpenter

These > comparisons should be >= to prevent accessing one element beyond the end of the buffer.

Fixes 9cb837480424 ("RDMA/rtrs: server: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-srv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-srv.c +2 -3
index 658c8999cb0d..0b53b79b0e27 100644
@@ -1213,8 +1213,8 @@ static void rtrs_srv_rdma_done(struct ib_cq *cq, struct ib_wc *wc)
 
                        msg_id = imm_payload >> sess->mem_bits;
                        off = imm_payload & ((1 << sess->mem_bits) - 1);
-                       if (unlikely(msg_id > srv->queue_depth ||
-                                    off > max_chunk_size)) {
+                       if (unlikely(msg_id >= srv->queue_depth ||
+                                    off >= max_chunk_size)) {
                                rtrs_err(s, "Wrong msg_id %u, off %u\n",
                                          msg_id, off);
                                close_sess(sess);
--
Quoted 2 lines

2.26.2

Thanks a lot, Dan!

#4 lore raw

Re: [PATCH] RDMA/rtrs: Fix a couple off by one bugs in rtrs_srv_rdma_done()

In reply to Dan Carpenter
Quoted 9 lines · Dan Carpenter

These > comparisons should be >= to prevent accessing one element beyond the end of the buffer.

Fixes 9cb837480424 ("RDMA/rtrs: server: main functionality")
---
 drivers/infiniband/ulp/rtrs/rtrs-srv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to for-next, thanks

Jason