From: Jason Gunthorpe <jgg@ziepe.ca>
To: Kangjie Lu <kjlu@umn.edu>
Cc: Faisal Latif <faisal.latif@intel.com>,
Shiraz Saleem <shiraz.saleem@intel.com>,
Doug Ledford <dledford@redhat.com>,
linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] infiniband: i40iw: fix potential NULL pointer dereferences
Date: Wed, 27 Mar 2019 10:20:03 -0300 [thread overview]
Message-ID: <20190327132003.GA12891@ziepe.ca> (raw)
In-Reply-To: <20190315065715.18249-1-kjlu@umn.edu>
On Fri, Mar 15, 2019 at 01:57:14AM -0500, Kangjie Lu wrote:
> alloc_ordered_workqueue may fail and return NULL.
> The fix captures the failure and handles it properly to avoid
> potential NULL pointer dereferences.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
> V2: add return value to capture the error code
> ---
> drivers/infiniband/hw/i40iw/i40iw.h | 2 +-
> drivers/infiniband/hw/i40iw/i40iw_cm.c | 19 ++++++++++++++++---
> drivers/infiniband/hw/i40iw/i40iw_main.c | 5 ++++-
> 3 files changed, 21 insertions(+), 5 deletions(-)
applied to for-next thanks
> diff --git a/drivers/infiniband/hw/i40iw/i40iw.h b/drivers/infiniband/hw/i40iw/i40iw.h
> index 2f2b4426ded7..8feec35f95a7 100644
> --- a/drivers/infiniband/hw/i40iw/i40iw.h
> +++ b/drivers/infiniband/hw/i40iw/i40iw.h
> @@ -552,7 +552,7 @@ enum i40iw_status_code i40iw_obj_aligned_mem(struct i40iw_device *iwdev,
>
> void i40iw_request_reset(struct i40iw_device *iwdev);
> void i40iw_destroy_rdma_device(struct i40iw_ib_device *iwibdev);
> -void i40iw_setup_cm_core(struct i40iw_device *iwdev);
> +int i40iw_setup_cm_core(struct i40iw_device *iwdev);
> void i40iw_cleanup_cm_core(struct i40iw_cm_core *cm_core);
> void i40iw_process_ceq(struct i40iw_device *, struct i40iw_ceq *iwceq);
> void i40iw_process_aeq(struct i40iw_device *);
> diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c
> index 206cfb0016f8..2e20786b9a57 100644
> --- a/drivers/infiniband/hw/i40iw/i40iw_cm.c
> +++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c
> @@ -3237,7 +3237,7 @@ void i40iw_receive_ilq(struct i40iw_sc_vsi *vsi, struct i40iw_puda_buf *rbuf)
> * core
> * @iwdev: iwarp device structure
> */
> -void i40iw_setup_cm_core(struct i40iw_device *iwdev)
> +int i40iw_setup_cm_core(struct i40iw_device *iwdev)
> {
> struct i40iw_cm_core *cm_core = &iwdev->cm_core;
>
> @@ -3256,9 +3256,20 @@ void i40iw_setup_cm_core(struct i40iw_device *iwdev)
>
> cm_core->event_wq = alloc_ordered_workqueue("iwewq",
> WQ_MEM_RECLAIM);
> + if (!cm_core->event_wq)
> + goto error;
>
> cm_core->disconn_wq = alloc_ordered_workqueue("iwdwq",
> WQ_MEM_RECLAIM);
> + if (!cm_core->disconn_wq)
> + goto error;
> +
> + return 0;
> +error:
> + i40iw_cleanup_cm_core(&iwdev->cm_core);
> + i40iw_pr_err("fail to setup CM core");
But I deleted this print, memory allocation failures already print
enough
Jason
prev parent reply other threads:[~2019-03-27 13:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-09 5:27 [PATCH] infiniband: i40iw: fix potential NULL pointer dereferences Kangjie Lu
2019-03-12 15:01 ` Jason Gunthorpe
2019-03-12 15:36 ` Saleem, Shiraz
2019-03-14 5:37 ` Kangjie Lu
2019-03-14 18:31 ` Saleem, Shiraz
2019-03-15 6:57 ` [PATCH v2] " Kangjie Lu
2019-03-18 13:56 ` Saleem, Shiraz
2019-03-27 13:20 ` Jason Gunthorpe [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190327132003.GA12891@ziepe.ca \
--to=jgg@ziepe.ca \
--cc=dledford@redhat.com \
--cc=faisal.latif@intel.com \
--cc=kjlu@umn.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=shiraz.saleem@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox