leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RDMA/cxgb3: Clean up properly on FW mismatch failures

Browse Source 
FW mismatches can cause a crash in the iw_cxgb3 event handler.

- NULL the t3cdev->ulp pointer on failures in cxio_rdev_open()
- Silently ignore events when the ulp ptr is NULL in iwch_err_handler()

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Steve Wise 2009-09-09 11:25:56 -07:00 committed by Roland Dreier
parent 13a239330a
commit ffc40c6433
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/infiniband/hw/cxgb3/cxio_hal.c
View File

@ -1034,6 +1034,7 @@ err3:
err2: err2:
cxio_hal_destroy_ctrl_qp(rdev_p); cxio_hal_destroy_ctrl_qp(rdev_p);
err1: err1:
rdev_p->t3cdev_p->ulp = NULL;
list_del(&rdev_p->entry); list_del(&rdev_p->entry);
return err; return err;
} }

5
drivers/infiniband/hw/cxgb3/iwch.c
View File

@ -165,10 +165,13 @@ static void close_rnic_dev(struct t3cdev *tdev)
static void iwch_event_handler(struct t3cdev *tdev, u32 evt, u32 port_id) static void iwch_event_handler(struct t3cdev *tdev, u32 evt, u32 port_id)
{ {
struct cxio_rdev *rdev = tdev->ulp; struct cxio_rdev *rdev = tdev->ulp;
struct iwch_dev *rnicp = rdev_to_iwch_dev(rdev); struct iwch_dev *rnicp;
struct ib_event event; struct ib_event event;
u32 portnum = port_id + 1; u32 portnum = port_id + 1;
if (!rdev)
return;
rnicp = rdev_to_iwch_dev(rdev);
switch (evt) { switch (evt) {
case OFFLOAD_STATUS_DOWN: { case OFFLOAD_STATUS_DOWN: {
rdev->flags = CXIO_ERROR_FATAL; rdev->flags = CXIO_ERROR_FATAL;