From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
To: linux-scsi@vger.kernel.org
Cc: andriusb@redhat.com, James.Bottomley@HansenPartnership.com,
dab@hp.com, thenzl@redhat.com, mikem@beardog.cce.hp.com
Subject: [PATCH 9/9] hpsa: sanitize max commands
Date: Wed, 16 Jun 2010 13:51:56 -0500 [thread overview]
Message-ID: <20100616185156.22798.45497.stgit@beardog.cce.hp.com> (raw)
In-Reply-To: <20100616184510.22798.26206.stgit@beardog.cce.hp.com>
From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
hpsa: sanitize max commands
Some controllers might try to tell us they support 0 commands
in performant mode. This is a lie told by buggy firmware.
We have to be wary of this lest we try to allocate a negative
number of command blocks, which will be treated as unsigned,
and get an out of memory condition.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
---
drivers/scsi/hpsa.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 8f11325..304c908 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3505,13 +3505,25 @@ static int __devinit hpsa_find_cfgtables(struct ctlr_info *h)
return 0;
}
+static void __devinit hpsa_get_max_perf_mode_cmds(struct ctlr_info *h)
+{
+ h->max_commands = readl(&(h->cfgtable->MaxPerformantModeCommands));
+ if (h->max_commands < 16) {
+ dev_warn(&h->pdev->dev, "Controller reports "
+ "max supported commands of %d, an obvious lie. "
+ "Using 16. Ensure that firmware is up to date.\n",
+ h->max_commands);
+ h->max_commands = 16;
+ }
+}
+
/* Interrogate the hardware for some limits:
* max commands, max SG elements without chaining, and with chaining,
* SG chain block size, etc.
*/
static void __devinit hpsa_find_board_params(struct ctlr_info *h)
{
- h->max_commands = readl(&(h->cfgtable->MaxPerformantModeCommands));
+ hpsa_get_max_perf_mode_cmds(h);
h->nr_cmds = h->max_commands - 4; /* Allow room for some ioctls */
h->maxsgentries = readl(&(h->cfgtable->MaxScatterGatherElements));
/*
@@ -4056,7 +4068,7 @@ static __devinit void hpsa_put_ctlr_into_performant_mode(struct ctlr_info *h)
if (!(trans_support & PERFORMANT_MODE))
return;
- h->max_commands = readl(&(h->cfgtable->MaxPerformantModeCommands));
+ hpsa_get_max_perf_mode_cmds(h);
h->max_sg_entries = 32;
/* Performant mode ring buffer and supporting data structures */
h->reply_pool_size = h->max_commands * sizeof(u64);
prev parent reply other threads:[~2010-06-16 18:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-16 18:51 [PATCH 0/9] hpsa driver updates June 16, 2010 Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 1/9] hpsa: add new controllers Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 2/9] hpsa: Make "hpsa_allow_any=1" boot param enable Compaq Smart Arrays Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 3/9] hpsa: make hpsa_find_memory_BAR not require the per HBA structure Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 4/9] hpsa: factor out hpsa_find_cfg_addrs Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 5/9] hpsa: factor out the code to reset controllers on driver load Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 6/9] hpsa: Fix hard reset code Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 7/9] hpsa: forbid hard reset of 640x boards Stephen M. Cameron
2010-06-16 18:51 ` [PATCH 8/9] hpsa: separate intx and msi/msix interrupt handlers Stephen M. Cameron
2010-06-16 18:51 ` Stephen M. Cameron [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=20100616185156.22798.45497.stgit@beardog.cce.hp.com \
--to=scameron@beardog.cce.hp.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=andriusb@redhat.com \
--cc=dab@hp.com \
--cc=linux-scsi@vger.kernel.org \
--cc=mikem@beardog.cce.hp.com \
--cc=thenzl@redhat.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