From: Damien Le Moal <damien.lemoal@wdc.com>
To: Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org, linux-ide@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org
Cc: Sathya Prakash <sathya.prakash@broadcom.com>,
Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Subject: [PATCH v4 01/10] libata: fix ata_host_alloc_pinfo()
Date: Sat, 7 Aug 2021 13:18:50 +0900 [thread overview]
Message-ID: <20210807041859.579409-2-damien.lemoal@wdc.com> (raw)
In-Reply-To: <20210807041859.579409-1-damien.lemoal@wdc.com>
Avoid static checkers warnings about a potential NULL pointer
dereference for the port info variable pi. To do so, test that at least
one port info is available on entry to ata_host_alloc_pinfo() and start
the ata port initialization for loop with pi initialized to a non-NULL
pointer. Within the for loop, get the next port info (if it is not NULL)
after initializing the ata port using the previous port info.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
drivers/ata/libata-core.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 61c762961ca8..b17e161c07e2 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5441,16 +5441,17 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev,
struct ata_host *host;
int i, j;
+ /* We must have at least one port info */
+ if (!ppi[0])
+ return NULL;
+
host = ata_host_alloc(dev, n_ports);
if (!host)
return NULL;
- for (i = 0, j = 0, pi = NULL; i < host->n_ports; i++) {
+ for (i = 0, j = 0, pi = ppi[0]; i < host->n_ports; i++) {
struct ata_port *ap = host->ports[i];
- if (ppi[j])
- pi = ppi[j++];
-
ap->pio_mask = pi->pio_mask;
ap->mwdma_mask = pi->mwdma_mask;
ap->udma_mask = pi->udma_mask;
@@ -5458,8 +5459,13 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev,
ap->link.flags |= pi->link_flags;
ap->ops = pi->port_ops;
- if (!host->ops && (pi->port_ops != &ata_dummy_port_ops))
+ if (!host->ops && pi->port_ops != &ata_dummy_port_ops)
host->ops = pi->port_ops;
+
+ if (ppi[j + 1]) {
+ j++;
+ pi = ppi[j];
+ }
}
return host;
--
2.31.1
next prev parent reply other threads:[~2021-08-07 4:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-07 4:18 [PATCH v4 00/10] libata cleanups and improvements Damien Le Moal
2021-08-07 4:18 ` Damien Le Moal [this message]
2021-08-09 6:09 ` [PATCH v4 01/10] libata: fix ata_host_alloc_pinfo() Hannes Reinecke
2021-08-09 9:07 ` Damien Le Moal
2021-08-07 4:18 ` [PATCH v4 02/10] libata: fix ata_host_start() Damien Le Moal
2021-08-07 4:18 ` [PATCH v4 03/10] libata: fix sparse warning Damien Le Moal
2021-08-09 6:10 ` Hannes Reinecke
2021-08-07 4:18 ` [PATCH v4 04/10] libata: cleanup device sleep capability detection Damien Le Moal
2021-08-07 4:18 ` [PATCH v4 05/10] libata: cleanup ata_dev_configure() Damien Le Moal
2021-08-07 4:18 ` [PATCH v4 06/10] libata: cleanup NCQ priority handling Damien Le Moal
2021-08-07 4:18 ` [PATCH v4 07/10] libata: fix ata_read_log_page() warning Damien Le Moal
2021-08-07 4:18 ` [PATCH v4 08/10] libata: print feature list on device scan Damien Le Moal
2021-08-07 4:18 ` [PATCH v4 09/10] libahci: Introduce ncq_prio_supported sysfs sttribute Damien Le Moal
2021-08-09 6:11 ` Hannes Reinecke
2021-08-07 4:18 ` [PATCH v4 10/10] scsi: mpt3sas: Introduce sas_ncq_prio_supported " Damien Le Moal
2021-08-10 3:12 ` Martin K. Petersen
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=20210807041859.579409-2-damien.lemoal@wdc.com \
--to=damien.lemoal@wdc.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sathya.prakash@broadcom.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=suganath-prabu.subramani@broadcom.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;
as well as URLs for NNTP newsgroup(s).