Commit d4adee09 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Jon Mason

NTB: fix access of free-ed pointer

We were accessing nt->mw_vec after freeing it. Fix the error path so
that we free nt->mw_vec after we have finished using it.
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent 04afde45
...@@ -1080,7 +1080,7 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev) ...@@ -1080,7 +1080,7 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev)
GFP_KERNEL, node); GFP_KERNEL, node);
if (!nt->qp_vec) { if (!nt->qp_vec) {
rc = -ENOMEM; rc = -ENOMEM;
goto err2; goto err1;
} }
if (nt_debugfs_dir) { if (nt_debugfs_dir) {
...@@ -1092,7 +1092,7 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev) ...@@ -1092,7 +1092,7 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev)
for (i = 0; i < qp_count; i++) { for (i = 0; i < qp_count; i++) {
rc = ntb_transport_init_queue(nt, i); rc = ntb_transport_init_queue(nt, i);
if (rc) if (rc)
goto err3; goto err2;
} }
INIT_DELAYED_WORK(&nt->link_work, ntb_transport_link_work); INIT_DELAYED_WORK(&nt->link_work, ntb_transport_link_work);
...@@ -1100,12 +1100,12 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev) ...@@ -1100,12 +1100,12 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev)
rc = ntb_set_ctx(ndev, nt, &ntb_transport_ops); rc = ntb_set_ctx(ndev, nt, &ntb_transport_ops);
if (rc) if (rc)
goto err3; goto err2;
INIT_LIST_HEAD(&nt->client_devs); INIT_LIST_HEAD(&nt->client_devs);
rc = ntb_bus_init(nt); rc = ntb_bus_init(nt);
if (rc) if (rc)
goto err4; goto err3;
nt->link_is_up = false; nt->link_is_up = false;
ntb_link_enable(ndev, NTB_SPEED_AUTO, NTB_WIDTH_AUTO); ntb_link_enable(ndev, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
...@@ -1113,17 +1113,16 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev) ...@@ -1113,17 +1113,16 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev)
return 0; return 0;
err4:
ntb_clear_ctx(ndev);
err3: err3:
kfree(nt->qp_vec); ntb_clear_ctx(ndev);
err2: err2:
kfree(nt->mw_vec); kfree(nt->qp_vec);
err1: err1:
while (i--) { while (i--) {
mw = &nt->mw_vec[i]; mw = &nt->mw_vec[i];
iounmap(mw->vbase); iounmap(mw->vbase);
} }
kfree(nt->mw_vec);
err: err:
kfree(nt); kfree(nt);
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment