nvmet-rdma: Fix NULL deref when setting pi_enable and traddr INADDR_ANY
Subsystems (2)
PATCH 1/1 nvmet-rdma: Fix NULL deref when setting pi_enable and traddr INADDR_ANY
When setting port traddr to INADDR_ANY, the listening cm_id->device is NULL. The associate IB device is known only when a connect request event arrives, so checking T10-PI device capability should be done at this stage.
Fixes b09160c3996c ("nvmet-rdma: add metadata/T10-PI support")
Signed-off-by Israel Rukshin <[email protected]>
Reviewed-by Max Gurtovoy <[email protected]>
--- drivers/nvme/target/rdma.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/nvme/target/rdma.c +8 -8
@@ -1220,6 +1220,14 @@ nvmet_rdma_find_get_device(struct rdma_cm_id *cm_id) } ndev->inline_data_size = nport->inline_data_size; ndev->inline_page_count = inline_page_count; + +if (nport->pi_enable && !(cm_id->device->attrs.device_cap_flags & +IB_DEVICE_INTEGRITY_HANDOVER )) { +pr_warn ("T10-PI is not supported by device %s. Disabling it\n" , + cm_id->device->name); + nport->pi_enable = false; + } + ndev->device = cm_id->device;kref_init (&ndev->ref);
@@ -1855,14 +1863,6 @@ static int nvmet_rdma_enable_port(struct nvmet_rdma_port *port) goto out_destroy_id; } -if (port->nport->pi_enable && - !(cm_id->device->attrs.device_cap_flags & -IB_DEVICE_INTEGRITY_HANDOVER )) { -pr_err ("T10-PI is not supported for %pISpcs\n" , addr); - ret = -EINVAL ; - goto out_destroy_id; - } - port->cm_id = cm_id;return 0 ;
Signature · 7 lines
2.18.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Thanks,
applied to nvme-5.11.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
FWIW,
Reviewed-by Sagi Grimberg <[email protected]>
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme