From: Jia-Ju Bai <baijiaju1990@gmail.com>
To: josh.h.morris@us.ibm.com, pjk1939@linux.ibm.com, axboe@kernel.dk
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Jia-Ju Bai <baijiaju1990@gmail.com>
Subject: [PATCH] block: rsxx: fix error return code of rsxx_pci_probe()
Date: Mon, 8 Mar 2021 02:05:54 -0800 [thread overview]
Message-ID: <20210308100554.10375-1-baijiaju1990@gmail.com> (raw)
Some error handling segments of rsxx_pci_probe() do not return error code,
so add error code for these segments.
Fixes: 8722ff8cdbfa ("block: IBM RamSan 70/80 device driver")
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
---
drivers/block/rsxx/core.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
index 63f549889f87..6b3b9b31a3e8 100644
--- a/drivers/block/rsxx/core.c
+++ b/drivers/block/rsxx/core.c
@@ -760,13 +760,17 @@ static int rsxx_pci_probe(struct pci_dev *dev,
pci_set_drvdata(dev, card);
st = ida_alloc(&rsxx_disk_ida, GFP_KERNEL);
- if (st < 0)
+ if (st < 0) {
+ st = -ENOMEM;
goto failed_ida_get;
+ }
card->disk_id = st;
st = pci_enable_device(dev);
- if (st)
+ if (st) {
+ st = -EIO;
goto failed_enable;
+ }
pci_set_master(dev);
@@ -774,6 +778,7 @@ static int rsxx_pci_probe(struct pci_dev *dev,
if (st) {
dev_err(CARD_TO_DEV(card),
"No usable DMA configuration,aborting\n");
+ st = -EIO;
goto failed_dma_mask;
}
@@ -781,6 +786,7 @@ static int rsxx_pci_probe(struct pci_dev *dev,
if (st) {
dev_err(CARD_TO_DEV(card),
"Failed to request memory region\n");
+ st = -EIO;
goto failed_request_regions;
}
@@ -817,6 +823,7 @@ static int rsxx_pci_probe(struct pci_dev *dev,
if (st) {
dev_err(CARD_TO_DEV(card),
"Failed requesting IRQ%d\n", dev->irq);
+ st = -EINVAL;
goto failed_irq;
}
@@ -824,6 +831,7 @@ static int rsxx_pci_probe(struct pci_dev *dev,
st = rsxx_creg_setup(card);
if (st) {
dev_err(CARD_TO_DEV(card), "Failed to setup creg interface.\n");
+ st = -EINVAL;
goto failed_creg_setup;
}
@@ -862,6 +870,7 @@ static int rsxx_pci_probe(struct pci_dev *dev,
if (st) {
dev_info(CARD_TO_DEV(card),
"Failed to setup DMA engine\n");
+ st = -EINVAL;
goto failed_dma_setup;
}
@@ -869,14 +878,17 @@ static int rsxx_pci_probe(struct pci_dev *dev,
card->event_wq = create_singlethread_workqueue(DRIVER_NAME"_event");
if (!card->event_wq) {
dev_err(CARD_TO_DEV(card), "Failed card event setup.\n");
+ st = -ENOMEM;
goto failed_event_handler;
}
INIT_WORK(&card->event_work, card_event_handler);
st = rsxx_setup_dev(card);
- if (st)
+ if (st) {
+ st = -EINVAL;
goto failed_create_dev;
+ }
rsxx_get_card_state(card, &card->state);
--
2.17.1
next reply other threads:[~2021-03-08 10:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 10:05 Jia-Ju Bai [this message]
2021-03-09 20:59 ` [PATCH] block: rsxx: fix error return code of rsxx_pci_probe() Jens Axboe
2021-03-10 1:13 ` Jia-Ju Bai
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=20210308100554.10375-1-baijiaju1990@gmail.com \
--to=baijiaju1990@gmail.com \
--cc=axboe@kernel.dk \
--cc=josh.h.morris@us.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pjk1939@linux.ibm.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