Skip to contentSkip to conversation

RDMA/cma: Remove open coding for overflow in cma_connect_ib

PATCH In review Håkon Bugge 2 participants 4 messages Nov 22, 2021 – Nov 23, 2021 InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA/cma: Remove open coding for overflow in cma_connect_ib

The existing test is a little hard to comprehend. Use check_add_overflow() instead.

Fixes 04ded1672402 ("RDMA/cma: Verify private data length")
---
 drivers/infiniband/core/cma.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/core/cma.c +1 -2
index 835ac54..0435768 100644
@@ -4093,8 +4093,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
 
 	memset(&req, 0, sizeof req);
 	offset = cma_user_data_offset(id_priv);
-	req.private_data_len = offset + conn_param->private_data_len;
-	if (req.private_data_len < conn_param->private_data_len)
+	if (check_add_overflow(offset, conn_param->private_data_len, &req.private_data_len))
 		return -EINVAL;
 
 	if (req.private_data_len) {
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 14 lines · Håkon Bugge

The existing test is a little hard to comprehend. Use check_add_overflow() instead.

Fixes 04ded1672402 ("RDMA/cma: Verify private data length")
---
 drivers/infiniband/core/cma.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/core/cma.c +0 -0
index 835ac54..0435768 100644

drivers/infiniband/core/cma.c static int cma_connect_ib(struct rdma_id_private *id_priv, · line 4097

Quoted 7 lines
drivers/infiniband/core/cma.c +1 -2
@@ -4093,8 +4093,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
 
 	memset(&req, 0, sizeof req);
 	offset = cma_user_data_offset(id_priv);
-	req.private_data_len = offset + conn_param->private_data_len;
-	if (req.private_data_len < conn_param->private_data_len)
+	if (check_add_overflow(offset, conn_param->private_data_len, &req.private_data_len))
 		return -EINVAL;

The same check exists in cma_resolve_ib_udp too.

Thanks

Quoted 5 lines
drivers/infiniband/core/cma.c +0 -0
 	if (req.private_data_len) {
Signature · 1 line
1.8.3.1
#2 lore raw
Quoted 20 lines · Leon Romanovsky
Quoted 15 lines · Håkon Bugge

The existing test is a little hard to comprehend. Use check_add_overflow() instead.

Fixes 04ded1672402 ("RDMA/cma: Verify private data length")

---
drivers/infiniband/core/cma.c | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/core/cma.c +0 -0
index 835ac54..0435768 100644
@@ -4093,8 +4093,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
 
Quoted 8 lines

drivers/infiniband/core/cma.c static int cma_connect_ib(struct rdma_id_private *id_priv, · line 4097

Quoted 6 lines
drivers/infiniband/core/cma.c +1 -2
 	memset(&req, 0, sizeof req);
 	offset = cma_user_data_offset(id_priv);
-	req.private_data_len = offset + conn_param->private_data_len;
-	if (req.private_data_len < conn_param->private_data_len)
+	if (check_add_overflow(offset, conn_param->private_data_len, &req.private_data_len))
 		return -EINVAL;

The same check exists in cma_resolve_ib_udp too.

Thanks for pointing it out Leon. Will send a v2.

Thxs, Håkon

Quoted 7 lines

Thanks

Quoted 4 lines
drivers/infiniband/core/cma.c +0 -0
 	if (req.private_data_len) {
Signature · 1 line
1.8.3.1
#3 lore raw
Quoted 33 lines · Haakon Bugge
Quoted 21 lines · Leon Romanovsky
Quoted 15 lines · Håkon Bugge

The existing test is a little hard to comprehend. Use check_add_overflow() instead.

Fixes 04ded1672402 ("RDMA/cma: Verify private data length")

---
drivers/infiniband/core/cma.c | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/core/cma.c +0 -0
index 835ac54..0435768 100644
@@ -4093,8 +4093,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
 
Quoted 8 lines

drivers/infiniband/core/cma.c static int cma_connect_ib(struct rdma_id_private *id_priv, · line 4097

Quoted 6 lines
drivers/infiniband/core/cma.c +1 -2
 	memset(&req, 0, sizeof req);
 	offset = cma_user_data_offset(id_priv);
-	req.private_data_len = offset + conn_param->private_data_len;
-	if (req.private_data_len < conn_param->private_data_len)
+	if (check_add_overflow(offset, conn_param->private_data_len, &req.private_data_len))
 		return -EINVAL;

The same check exists in cma_resolve_ib_udp too.

Quoted 1 line

Thanks for pointing it out Leon. Will send a v2.

Be aware, will change $Subject slightly.

Håkon

Quoted 11 lines

Thxs, Håkon

Quoted 7 lines

Thanks

Quoted 4 lines
drivers/infiniband/core/cma.c +0 -0
 	if (req.private_data_len) {
Signature · 1 line
1.8.3.1