2009-11-18 20:32:45

by Stephen M. Cameron

Subject: [PATCH] cciss: fix scatter gather cleanup problems

From: Stephen M. Cameron <[email protected]>

cciss: fix scatter gather cleanup problems
On driver unload, only free up the extra scatter gather data
if they were allocated in the first place (the controller
supports it) and don't forget to free up the sg_cmd_list
array of pointers.

Signed-off-by: Don Brace <[email protected]>
Signed-off-by: Stephen M. Cameron <[email protected]>
---
drivers/block/cciss.c | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index eab81c6..873e594 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4326,10 +4326,15 @@ clean4:
for (k = 0; k < hba[i]->nr_cmds; k++)
kfree(hba[i]->scatter_list[k]);
kfree(hba[i]->scatter_list);
- for (j = 0; j < hba[i]->nr_cmds; j++) {
- if (hba[i]->cmd_sg_list[j])
- kfree(hba[i]->cmd_sg_list[j]->sgchain);
- kfree(hba[i]->cmd_sg_list[j]);
+ /* Only free up extra s/g lists if controller supports them */
+ if (hba[i]->chainsize > 0) {
+ for (j = 0; j < hba[i]->nr_cmds; j++) {
+ if (hba[i]->cmd_sg_list[j]) {
+ kfree(hba[i]->cmd_sg_list[j]->sgchain);
+ kfree(hba[i]->cmd_sg_list[j]);
+ }
+ }
+ kfree(hba[i]->cmd_sg_list);
}
if (hba[i]->cmd_pool)
pci_free_consistent(hba[i]->pdev,
@@ -4448,9 +4453,15 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
for (j = 0; j < hba[i]->nr_cmds; j++)
kfree(hba[i]->scatter_list[j]);
kfree(hba[i]->scatter_list);
- for (j = 0; j < hba[i]->nr_cmds; j++) {
- kfree(hba[i]->cmd_sg_list[j]->sgchain);
- kfree(hba[i]->cmd_sg_list[j]);
+ /* Only free up extra s/g lists if controller supports them */
+ if (hba[i]->chainsize > 0) {
+ for (j = 0; j < hba[i]->nr_cmds; j++) {
+ if (hba[i]->cmd_sg_list[j]) {
+ kfree(hba[i]->cmd_sg_list[j]->sgchain);
+ kfree(hba[i]->cmd_sg_list[j]);
+ }
+ }
+ kfree(hba[i]->cmd_sg_list);
}
/*
* Deliberately omit pci_disable_device(): it does something nasty to

2009-11-23 08:33:09

by Jens Axboe

Subject: Re: [PATCH] cciss: fix scatter gather cleanup problems

On Wed, Nov 18 2009, Stephen M. Cameron wrote:
> From: Stephen M. Cameron <[email protected]>
>
> cciss: fix scatter gather cleanup problems
> On driver unload, only free up the extra scatter gather data
> if they were allocated in the first place (the controller
> supports it) and don't forget to free up the sg_cmd_list
> array of pointers.

Thanks, applied.

--
Jens Axboe