staging: lustre: lnet: Don't access NULL NI on failure path

In kiblnd_passive_connect(), if we are failing the connection
attempt because we cannot find a valid NI (we have a NULL NI),
we were coring after the "goto fail" because the failure
path was assuming non-NULL NI.

This patch ensures we don't dereference a NULL NI on that
failure path.

Signed-off-by: Doug Oucharek <doug.s.oucharek@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8022
Reviewed-on: http://review.whamcloud.com/19614
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Matt Ezell <ezellma@ornl.gov>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Doug Oucharek 2016-06-09 18:45:45 -04:00 committed by Greg Kroah-Hartman
parent 03cce00b4b
commit a9cc400615
1 changed files with 4 additions and 3 deletions

View File

@ -2521,12 +2521,13 @@ kiblnd_passive_connect(struct rdma_cm_id *cmid, void *priv, int priv_nob)
return 0; return 0;
failed: failed:
if (ni) if (ni) {
lnet_ni_decref(ni); lnet_ni_decref(ni);
rej.ibr_version = version;
rej.ibr_cp.ibcp_queue_depth = kiblnd_msg_queue_size(version, ni); rej.ibr_cp.ibcp_queue_depth = kiblnd_msg_queue_size(version, ni);
rej.ibr_cp.ibcp_max_frags = kiblnd_rdma_frags(version, ni); rej.ibr_cp.ibcp_max_frags = kiblnd_rdma_frags(version, ni);
}
rej.ibr_version = version;
kiblnd_reject(cmid, &rej); kiblnd_reject(cmid, &rej);
return -ECONNREFUSED; return -ECONNREFUSED;