mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "chenxiang (M)" <chenxiang66@hisilicon.com>
To: "Gustavo A. R. Silva" <gustavo@embeddedor.com>,
	John Garry <john.garry@huawei.com>,
	"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] scsi: hisi_sas: Fix NULL pointer dereference
Date: Fri, 19 Oct 2018 08:54:04 +0800	[thread overview]
Message-ID: <8bf37d22-8416-2b0b-1049-9c93b73ffc4d@hisilicon.com> (raw)
In-Reply-To: <20181018165939.GA26491@embeddedor.com>

在 2018/10/19 0:59, Gustavo A. R. Silva 写道:
> There is a NULL pointer dereference in case *slot* happens to
> be NULL at lines 1053 and 1878:
>
> struct hisi_sas_cq *cq =
> 	&hisi_hba->cq[slot->dlvry_queue];
>
> Notice that *slot* is being NULL checked at lines 1057 and 1881:
> if (slot), which implies it may be NULL.
>
> Fix this by placing the declaration and definition of variable cq,
> which contains the pointer dereference slot->dlvry_queue, after
> slot has been properly NULL checked.
>
> Addresses-Coverity-ID: 1474515 ("Dereference before null check")
> Addresses-Coverity-ID: 1474520 ("Dereference before null check")
> Fixes: 584f53fe5f52 ("scsi: hisi_sas: Fix the race between IO completion and timeout for SMP/internal IO")
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>

Reviewed-by: Xiang Chen <chenxiang66@hisilicon.com>
Thanks!

> ---
> Changes in v2:
>   - Fix another instance of the same issue at line 1053.
>   - Update commit log.
>
>   drivers/scsi/hisi_sas/hisi_sas_main.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
> index 2e5eaf1..b3f01d5 100644
> --- a/drivers/scsi/hisi_sas/hisi_sas_main.c
> +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
> @@ -1050,11 +1050,11 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device,
>   		if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
>   			if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
>   				struct hisi_sas_slot *slot = task->lldd_task;
> -				struct hisi_sas_cq *cq =
> -					&hisi_hba->cq[slot->dlvry_queue];
>   
>   				dev_err(dev, "abort tmf: TMF task timeout and not done\n");
>   				if (slot) {
> +					struct hisi_sas_cq *cq =
> +					       &hisi_hba->cq[slot->dlvry_queue];
>   					/*
>   					 * flush tasklet to avoid free'ing task
>   					 * before using task in IO completion
> @@ -1875,10 +1875,10 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,
>   	if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
>   		if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
>   			struct hisi_sas_slot *slot = task->lldd_task;
> -			struct hisi_sas_cq *cq =
> -				&hisi_hba->cq[slot->dlvry_queue];
>   
>   			if (slot) {
> +				struct hisi_sas_cq *cq =
> +					&hisi_hba->cq[slot->dlvry_queue];
>   				/*
>   				 * flush tasklet to avoid free'ing task
>   				 * before using task in IO completion



  reply	other threads:[~2018-10-19  0:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-18 16:59 Gustavo A. R. Silva
2018-10-19  0:54 ` chenxiang (M) [this message]
2018-10-19 22:28 ` Martin K. Petersen
2018-10-20  6:34   ` Gustavo A. R. Silva

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=8bf37d22-8416-2b0b-1049-9c93b73ffc4d@hisilicon.com \
    --to=chenxiang66@hisilicon.com \
    --cc=gustavo@embeddedor.com \
    --cc=jejb@linux.vnet.ibm.com \
    --cc=john.garry@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.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

all inboxes | Powered by JetHome®