From: Dany Madden <drt@linux.ibm.com>
To: netdev@vger.kernel.org
Cc: drt@linux.ibm.com, sukadev@linux.ibm.com, ljp@linux.ibm.com
Subject: [PATCH net v2 3/9] ibmvnic: avoid memset null scrq msgs
Date: Mon, 23 Nov 2020 18:57:51 -0500 [thread overview]
Message-ID: <20201123235757.6466-4-drt@linux.ibm.com> (raw)
In-Reply-To: <20201123235757.6466-1-drt@linux.ibm.com>
scrq->msgs could be NULL during device reset, causing Linux to crash.
So, check before memset scrq->msgs.
Fixes: c8b2ad0a4a901 ("ibmvnic: Sanitize entire SCRQ buffer on reset")
Signed-off-by: Dany Madden <drt@linux.ibm.com>
Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index d5a927bb4954..e84255c2fc72 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -2844,16 +2844,26 @@ static int reset_one_sub_crq_queue(struct ibmvnic_adapter *adapter,
struct ibmvnic_sub_crq_queue *scrq)
{
int rc;
+ if (!scrq) {
+ netdev_dbg(adapter->netdev,
+ "Invalid scrq reset. irq (%d) or msgs (%p).\n",
+ scrq->irq, scrq->msgs);
+ return -EINVAL;
+ }
if (scrq->irq) {
free_irq(scrq->irq, scrq);
irq_dispose_mapping(scrq->irq);
scrq->irq = 0;
}
-
- memset(scrq->msgs, 0, 4 * PAGE_SIZE);
- atomic_set(&scrq->used, 0);
- scrq->cur = 0;
+ if (scrq->msgs) {
+ memset(scrq->msgs, 0, 4 * PAGE_SIZE);
+ atomic_set(&scrq->used, 0);
+ scrq->cur = 0;
+ } else {
+ netdev_dbg(adapter->netdev, "Invalid scrq reset\n");
+ return -EINVAL;
+ }
rc = h_reg_sub_crq(adapter->vdev->unit_address, scrq->msg_token,
4 * PAGE_SIZE, &scrq->crq_num, &scrq->hw_irq);
--
2.26.2
next prev parent reply other threads:[~2020-11-23 23:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 23:57 [PATCH net v2 0/9] ibmvnic: assorted bug fixes Dany Madden
2020-11-23 23:57 ` [PATCH net v2 1/9] ibmvnic: handle inconsistent login with reset Dany Madden
2020-11-23 23:57 ` [PATCH net v2 2/9] ibmvnic: stop free_all_rwi on failed reset Dany Madden
2020-11-23 23:57 ` Dany Madden [this message]
2020-11-25 20:52 ` [PATCH net v2 3/9] ibmvnic: avoid memset null scrq msgs Jakub Kicinski
2020-11-23 23:57 ` [PATCH net v2 4/9] ibmvnic: restore adapter state on failed reset Dany Madden
2020-11-23 23:57 ` [PATCH net v2 5/9] ibmvnic: delay next reset if hard reset fails Dany Madden
2020-11-23 23:57 ` [PATCH net v2 6/9] ibmvnic: track pending login Dany Madden
2020-11-23 23:57 ` [PATCH net v2 7/9] ibmvnic: send_login should check for crq errors Dany Madden
2020-11-23 23:57 ` [PATCH net v2 8/9] ibmvnic: no reset timeout for 5 seconds after reset Dany Madden
2020-11-23 23:57 ` [PATCH net v2 9/9] ibmvnic: reduce wait for completion time Dany Madden
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=20201123235757.6466-4-drt@linux.ibm.com \
--to=drt@linux.ibm.com \
--cc=ljp@linux.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=sukadev@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;
as well as URLs for NNTP newsgroup(s).