Skip to contentSkip to conversation

RDMA/irdma: Check for null udata during reg_user_mr

PATCH In review Jacob Moroni 2 participants 3 messages Jun 30 – Jul 5

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

PATCH 1/1 RDMA/irdma: Check for null udata during reg_user_mr

The irdma driver requires udata for reg_user_mr. Previously, it was assuming that it was always non-null, but it can actually be null if the user intentionally triggers the UVERBS_METHOD_REG_MR ioctl.

---
 drivers/infiniband/hw/irdma/verbs.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/infiniband/hw/irdma/verbs.c +3 -0
index cb54c7c8fcd..3bcac68a612 100644
@@ -3519,6 +3519,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 	if (dmah)
 		return ERR_PTR(-EOPNOTSUPP);
 
+	if (!udata)
+		return ERR_PTR(-EINVAL);
+
 	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
 		return ERR_PTR(-EINVAL);
 
Signature · 1 line
2.55.0.rc0.799.gd6f94ed593-goog
#1 lore raw
Quoted 15 lines · Jacob Moroni

The irdma driver requires udata for reg_user_mr. Previously, it was assuming that it was always non-null, but it can actually be null if the user intentionally triggers the UVERBS_METHOD_REG_MR ioctl.

---
 drivers/infiniband/hw/irdma/verbs.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index cb54c7c8fcd..3bcac68a612 100644

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3523

Quoted 5 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
@@ -3519,6 +3519,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 	if (dmah)
 		return ERR_PTR(-EOPNOTSUPP);
 
+	if (!udata)
+		return ERR_PTR(-EINVAL);

Is this check specific to iRDMA?

Thanks

Quoted 7 lines
drivers/infiniband/hw/irdma/verbs.c +1 -0
+
 	if (len > iwdev->rf->sc_dev.hw_attrs.max_mr_size)
 		return ERR_PTR(-EINVAL);
 
Signature · 1 line
2.55.0.rc0.799.gd6f94ed593-goog
#2 lore raw
Quoted 19 lines · Leon Romanovsky
Quoted 18 lines · Jacob Moroni

The irdma driver requires udata for reg_user_mr. Previously, it was assuming that it was always non-null, but it can actually be null if the user intentionally triggers the UVERBS_METHOD_REG_MR ioctl.

---
 drivers/infiniband/hw/irdma/verbs.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/infiniband/hw/irdma/verbs.c +0 -0
index cb54c7c8fcd..3bcac68a612 100644
@@ -3519,6 +3519,9 @@ static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
 	if (dmah)
 		return ERR_PTR(-EOPNOTSUPP);
 
Quoted 4 lines

drivers/infiniband/hw/irdma/verbs.c static struct ib_mr *irdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 len, · line 3523

Quoted 2 lines
drivers/infiniband/hw/irdma/verbs.c +2 -0
+	if (!udata)
+		return ERR_PTR(-EINVAL);

Is this check specific to iRDMA?

Ohh, I see that it is fixed in 011199f46f44 ("RDMA/uverbs: Add UVERBS_ATTR_UHW to UVERBS_METHOD_REG_MR").

Thanks